diff --git a/1.3/Assemblies/RJW_patch_Autopsy.dll b/1.3/Assemblies/RJW_patch_Autopsy.dll index 2c0675d..48a2f57 100644 Binary files a/1.3/Assemblies/RJW_patch_Autopsy.dll and b/1.3/Assemblies/RJW_patch_Autopsy.dll differ diff --git a/1.4/Assemblies/RJW_patch_Autopsy.dll b/1.4/Assemblies/RJW_patch_Autopsy.dll index 333e191..d4163a1 100644 Binary files a/1.4/Assemblies/RJW_patch_Autopsy.dll and b/1.4/Assemblies/RJW_patch_Autopsy.dll differ diff --git a/About/Manifest.xml b/About/Manifest.xml index 1a93475..0f66f59 100644 --- a/About/Manifest.xml +++ b/About/Manifest.xml @@ -2,5 +2,5 @@ RJW patch - Harvest Organs Post Mortem - 5380.0.1.4 + 5371.0.1.4 \ No newline at end of file diff --git a/README.md b/README.md deleted file mode 100644 index 000cba3..0000000 --- a/README.md +++ /dev/null @@ -1 +0,0 @@ -I am sorry for the force push, but I had to remove some information from the repository's history. diff --git a/Source/RJW_patch_Autopsy.sln b/Source/RJW_patch_Autopsy.sln index 1079e6c..6c92d17 100644 --- a/Source/RJW_patch_Autopsy.sln +++ b/Source/RJW_patch_Autopsy.sln @@ -5,9 +5,7 @@ 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("{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}" +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}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution diff --git a/Source/RJW_patch_Autopsy/About/Manifest.xml b/Source/RJW_patch_Autopsy/About/Manifest.xml index 1a93475..0f66f59 100644 --- a/Source/RJW_patch_Autopsy/About/Manifest.xml +++ b/Source/RJW_patch_Autopsy/About/Manifest.xml @@ -2,5 +2,5 @@ RJW patch - Harvest Organs Post Mortem - 5380.0.1.4 + 5371.0.1.4 \ No newline at end of file diff --git a/Source/RJW_patch_Autopsy/Patches/NewMedicalRecipesUtilityPatch.cs b/Source/RJW_patch_Autopsy/Patches/NewMedicalRecipesUtilityPatch.cs index 01f7dd3..a11bf78 100644 --- a/Source/RJW_patch_Autopsy/Patches/NewMedicalRecipesUtilityPatch.cs +++ b/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 DEBUG = false; + private const bool DO_LOG = false; private static void log(String message) { - if (DEBUG) + if (DO_LOG) { Log.Message(message); } @@ -78,11 +78,11 @@ namespace RJW_patch_Autopsy //Simulate success chance scaled with skill etc. rjwNaturalThings.ForEach(t => { - if (DEBUG || Rand.Chance(Math.Min(skillChance, recipeInfo.NaturalChance))) results.Add(t); + if (Rand.Chance(Math.Min(skillChance, recipeInfo.NaturalChance))) results.Add(t); }); rjwArtificialThings.ForEach(t => { - if (DEBUG || Rand.Chance(Math.Min(skillChance, recipeInfo.BionicChance))) results.Add(t); + if (Rand.Chance(Math.Min(skillChance, recipeInfo.BionicChance))) results.Add(t); }); //Remove all parts that were tried to harvest from the corpse diff --git a/Source/RJW_patch_Autopsy/RJW_patch_Autopsy_1.3.csproj b/Source/RJW_patch_Autopsy/RJW_patch_Autopsy_1.3.csproj index 2405fac..43b2568 100644 --- a/Source/RJW_patch_Autopsy/RJW_patch_Autopsy_1.3.csproj +++ b/Source/RJW_patch_Autopsy/RJW_patch_Autopsy_1.3.csproj @@ -13,10 +13,10 @@ 11 - ©2024 Stardust3D + ©2023 Stardust3D Stardust3D - 5380.0.1.4 - 5380.0.1.4 + 5371.0.1.4 + 5371.0.1.4 true RJW_patch_Autopsy.snk This is a compatibility patch to enable 'Harvest Organs post mortem'/Autopsy to yield RJW bodyparts. @@ -26,13 +26,12 @@ - - + - - + + @@ -44,11 +43,9 @@ - - diff --git a/Source/RJW_patch_Autopsy/RJW_patch_Autopsy_1.4.csproj b/Source/RJW_patch_Autopsy/RJW_patch_Autopsy_1.4.csproj index 04227f6..b684e2e 100644 --- a/Source/RJW_patch_Autopsy/RJW_patch_Autopsy_1.4.csproj +++ b/Source/RJW_patch_Autopsy/RJW_patch_Autopsy_1.4.csproj @@ -13,10 +13,10 @@ 11 - ©2024 Stardust3D + ©2023 Stardust3D Stardust3D - 5380.0.1.4 - 5380.0.1.4 + 5371.0.1.4 + 5371.0.1.4 true RJW_patch_Autopsy.snk This is a compatibility patch to enable 'Harvest Organs post mortem'/Autopsy to yield RJW bodyparts. @@ -26,13 +26,12 @@ - - + - - + + @@ -44,11 +43,9 @@ - - diff --git a/Source/RJW_patch_Autopsy/RJW_patch_Autopsy_1.5.csproj b/Source/RJW_patch_Autopsy/RJW_patch_Autopsy_1.5.csproj deleted file mode 100644 index 5f5c25e..0000000 --- a/Source/RJW_patch_Autopsy/RJW_patch_Autopsy_1.5.csproj +++ /dev/null @@ -1,56 +0,0 @@ - - - - Debug - AnyCPU - {25a0821a-6b42-4fb0-a454-0ad22a7716e7} - Library - Properties - RJW_patch_Autopsy - RJW_patch_Autopsy - net48 - 512 - - - 11 - ©2024 Stardust3D - Stardust3D - 5380.0.1.4 - 5380.0.1.4 - true - RJW_patch_Autopsy.snk - This is a compatibility patch to enable 'Harvest Organs post mortem'/Autopsy to yield RJW bodyparts. - - - bin\Release\1.5\ - - - - - - - - - - - - - - ..\..\..\RimwoldAutopsy\1.5\Assemblies\Autopsy.dll - - - ..\..\..\rjw-base\1.5\Assemblies\RJW.dll - - - - - - - - - - - - - - diff --git a/Source/build.gradle.kts b/Source/build.gradle.kts index 6eddcd0..c12dc85 100644 --- a/Source/build.gradle.kts +++ b/Source/build.gradle.kts @@ -7,11 +7,10 @@ */ plugins { - alias(libs.plugins.msbuild) - alias(libs.plugins.versions) + id("com.ullink.msbuild") version "3.15" } -version = "5380.0.1.4" +version = "5371.0.1.4" val friendlyName = "rjw-patch-autopsy" tasks.register("buildC#_1.3") { @@ -38,18 +37,6 @@ tasks.register("buildC#_1.4") { // destinationDir = "build/msbuild/bin" } -tasks.register("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("sign_1.3") { dependsOn("buildC#_1.3") workingDir = project.projectDir.resolve("${rootProject.name}/bin/Release/1.3/net48") @@ -86,24 +73,6 @@ tasks.register("sign_1.4") { ) } -tasks.register("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") } @@ -137,12 +106,6 @@ tasks.register("copyDll_1.4") { into(project.projectDir.parentFile.resolve("1.4/Assemblies")) } -tasks.register("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("buildZip") { dependsOn("clean", ":copy") into("$friendlyName/1.3") { diff --git a/Source/gradle/libs.versions.toml b/Source/gradle/libs.versions.toml deleted file mode 100644 index de22e81..0000000 --- a/Source/gradle/libs.versions.toml +++ /dev/null @@ -1,11 +0,0 @@ -[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" }