diff --git a/.gitignore b/.gitignore index 3a2b88f..1976a72 100644 --- a/.gitignore +++ b/.gitignore @@ -301,3 +301,9 @@ __pycache__/ *.btm.cs *.odx.cs *.xsd.cs +Assemblies/0Harmony.dll +Assemblies/0Harmony.xml +Assemblies/0MultiplayerAPI.dll +Assemblies/Autopsy.dll +Assemblies/RJW.dll +Assemblies/RJW_patch_Autopsy.xml diff --git a/1.3/Assemblies/RJW_patch_Autopsy.dll b/1.3/Assemblies/RJW_patch_Autopsy.dll index 30f3889..e8120a4 100644 Binary files a/1.3/Assemblies/RJW_patch_Autopsy.dll and b/1.3/Assemblies/RJW_patch_Autopsy.dll differ diff --git a/About/About.xml b/About/About.xml index 5972037..479cb48 100644 --- a/About/About.xml +++ b/About/About.xml @@ -1,33 +1,34 @@ - RJW patch - Harvest Organs Post Mortem - Stardust3D - -
  • 1.3
    • -     - Stardust3D.RJW.patch.Autopsy - This is a compatibility patch to enable 'Harvest Organs post mortem'/Autopsy to yield RJW bodyparts. - -
  • - UnlimitedHugs.HugsLib - HugsLib - steam://url/CommunityFilePage/818773962 -
    • -
  • - Smuffle.HarvestOrgansPostMortem - HarvestOrgansPostMortem - https://github.com/DenJur/RimwoldAutopsy -
    • -
  • - rim.job.world - RimJobWorld - https://gitgud.io/Ed86/rjw -
    • -     - -
  • UnlimitedHugs.HugsLib
    • -
  • Smuffle.HarvestOrgansPostMortem
    • - -     + RJW patch - Harvest Organs Post Mortem + Stardust3D + +
  • 1.3
    • +     + Stardust3D.RJW.patch.Autopsy + This is a compatibility patch to enable 'Harvest Organs post mortem'/Autopsy to yield RJW bodyparts. + + +
  • + UnlimitedHugs.HugsLib + HugsLib + steam://url/CommunityFilePage/818773962 +
    • +
  • + Smuffle.HarvestOrgansPostMortem + HarvestOrgansPostMortem + https://github.com/DenJur/RimwoldAutopsy +
    • +
  • + rim.job.world + RimJobWorld + https://gitgud.io/Ed86/rjw +
    • +     + +
  • UnlimitedHugs.HugsLib
    • +
  • Smuffle.HarvestOrgansPostMortem
    • + +     \ No newline at end of file diff --git a/About/Manifest.xml b/About/Manifest.xml index 97fe566..38134a3 100644 --- a/About/Manifest.xml +++ b/About/Manifest.xml @@ -1,6 +1,6 @@ - RJW patch - Harvest Organs Post Mortem - 4943.0.1.3 + RJW patch - Harvest Organs Post Mortem + 4943.0.1.3 \ No newline at end of file diff --git a/Assemblies/RJW_patch_Autopsy.dll b/Assemblies/RJW_patch_Autopsy.dll index 30f3889..afe9774 100644 Binary files a/Assemblies/RJW_patch_Autopsy.dll and b/Assemblies/RJW_patch_Autopsy.dll differ diff --git a/Source/RJW_patch_Autopsy/Patches/NewMedicalRecipesUtilityPatch.cs b/Source/RJW_patch_Autopsy/Patches/NewMedicalRecipesUtilityPatch.cs index 083c620..46ad86d 100644 --- a/Source/RJW_patch_Autopsy/Patches/NewMedicalRecipesUtilityPatch.cs +++ b/Source/RJW_patch_Autopsy/Patches/NewMedicalRecipesUtilityPatch.cs @@ -54,20 +54,20 @@ namespace RJW_patch_Autopsy //rjwArtificialThings.Count(), rjwNaturalDiffs.Count(), rjwArtificialThings.Count(), rjwArtificialDiffs.Count())); //Simulate success chance scaled with skill etc. - rjwNaturalThings.ToList().ForEach(t => + rjwNaturalThings.ForEach(t => { if (Rand.Chance(Math.Min(skillChance, recipeInfo.NaturalChance))) results.Add(t); }); - rjwArtificialThings.ToList().ForEach(t => + rjwArtificialThings.ForEach(t => { if (Rand.Chance(Math.Min(skillChance, recipeInfo.BionicChance))) results.Add(t); }); - //Remove all parts that were tried to harves from the corpse - rjwNaturalDiffs.ToList().ForEach(d => corpse.InnerPawn.health.RemoveHediff(d)); - rjwArtificialDiffs.ToList().ForEach(d => corpse.InnerPawn.health.RemoveHediff(d)); + //Remove all parts that were tried to harvest from the corpse + rjwNaturalDiffs.ForEach(d => corpse.InnerPawn.health.RemoveHediff(d)); + rjwArtificialDiffs.ForEach(d => corpse.InnerPawn.health.RemoveHediff(d)); - if (results.Count() > recipeInfo.PartNumber) + if (results.Count > recipeInfo.PartNumber) { var random = new Random(); __result = results.OrderBy(i => random.Next()).Take(recipeInfo.PartNumber); diff --git a/Source/RJW_patch_Autopsy/Properties/AssemblyInfo.cs b/Source/RJW_patch_Autopsy/Properties/AssemblyInfo.cs index 5712d7d..62ae99e 100644 --- a/Source/RJW_patch_Autopsy/Properties/AssemblyInfo.cs +++ b/Source/RJW_patch_Autopsy/Properties/AssemblyInfo.cs @@ -5,7 +5,9 @@ using System.Runtime.InteropServices; // 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: + 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")] @@ -32,4 +34,4 @@ using System.Runtime.InteropServices; // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] [assembly: AssemblyVersion("4943.0.1.3")] -[assembly: AssemblyFileVersion("4943.0.1.3")] \ No newline at end of file +[assembly: AssemblyFileVersion("4943.0.1.3")] \ No newline at end of file diff --git a/Source/RJW_patch_Autopsy/RJW_patch_Autopsy.csproj b/Source/RJW_patch_Autopsy/RJW_patch_Autopsy.csproj index 4b7eb1b..b7550b7 100644 --- a/Source/RJW_patch_Autopsy/RJW_patch_Autopsy.csproj +++ b/Source/RJW_patch_Autopsy/RJW_patch_Autopsy.csproj @@ -1,88 +1,88 @@  - - - Debug - AnyCPU - {F17C6B3F-BA9D-4133-A201-1265A64BCB71} - Library - Properties - RJW_patch_Autopsy - RJW_patch_Autopsy - v4.8 - 512 - - - - - true - portable - false - ..\..\Assemblies\ - DEBUG;TRACE - prompt - 4 - false - - - - - portable - true - ..\..\Assemblies\ - - - prompt - 4 - false - ..\..\Assemblies\RJW_patch_Autopsy.xml - true - - - true - - - true - - - false - - - - ..\packages\Lib.Harmony.2.2.0\lib\net48\0Harmony.dll - - - ..\..\..\..\RimWorldWin64_Data\Managed\Assembly-CSharp.dll - False - - - ..\..\..\RimwoldAutopsy\1.3\Assemblies\Autopsy.dll - - - ..\..\..\..\..\..\workshop\content\294100\818773962\Assemblies\HugsLib.dll - False - - - ..\..\..\rjw-base\1.3\Assemblies\RJW.dll - - - - - - - - - - - - About\About.xml - - - About\Manifest.xml - - - - - - + + + Debug + AnyCPU + {F17C6B3F-BA9D-4133-A201-1265A64BCB71} + Library + Properties + RJW_patch_Autopsy + RJW_patch_Autopsy + v4.8 + 512 + + + + + true + portable + false + ..\..\Assemblies\ + DEBUG;TRACE + prompt + 4 + false + + + + + portable + true + ..\..\Assemblies\ + + + prompt + 4 + false + ..\..\Assemblies\RJW_patch_Autopsy.xml + true + + + true + + + true + + + false + + + + ..\packages\Lib.Harmony.2.2.0\lib\net48\0Harmony.dll + + + ..\..\..\..\RimWorldWin64_Data\Managed\Assembly-CSharp.dll + False + + + ..\..\..\RimwoldAutopsy\1.3\Assemblies\Autopsy.dll + + + ..\..\..\..\..\..\workshop\content\294100\818773962\Assemblies\HugsLib.dll + False + + + ..\..\..\rjw-base\1.3\Assemblies\RJW.dll + + + + + + + + + + + + About\About.xml + + + About\Manifest.xml + + + + + + \ No newline at end of file diff --git a/Source/RJW_patch_Autopsy/packages.config b/Source/RJW_patch_Autopsy/packages.config index edad86c..722dba4 100644 --- a/Source/RJW_patch_Autopsy/packages.config +++ b/Source/RJW_patch_Autopsy/packages.config @@ -1,4 +1,4 @@  - + \ No newline at end of file diff --git a/Source/gradle/wrapper/gradle-wrapper.properties b/Source/gradle/wrapper/gradle-wrapper.properties index e750102..2e6e589 100644 --- a/Source/gradle/wrapper/gradle-wrapper.properties +++ b/Source/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,5 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-7.3-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-7.3.3-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists