From 4300036667e6aed89df799d557699a4facf7ee72 Mon Sep 17 00:00:00 2001 From: Stardust3D <3dstardust@gmail.com> Date: Sun, 23 Jan 2022 22:06:32 +0100 Subject: [PATCH] cleanup --- .gitignore | 6 - 1.3/Assemblies/RJW_patch_Autopsy.dll | Bin 17464 -> 19512 bytes About/Manifest.xml | 2 +- Assemblies/RJW_patch_Autopsy.dll | Bin 8704 -> 19512 bytes Source/RJW_patch_Autopsy.sln | 16 +- .../Patches/NewMedicalRecipesUtilityPatch.cs | 32 ++-- .../Properties/AssemblyInfo.cs | 6 +- .../RJW_patch_Autopsy.csproj | 176 +++++++++--------- .../RJW_patch_Autopsy/RJW_patch_Autopsy.snk | Bin 0 -> 1172 bytes Source/build.gradle.kts | 2 +- 10 files changed, 131 insertions(+), 109 deletions(-) create mode 100644 Source/RJW_patch_Autopsy/RJW_patch_Autopsy.snk diff --git a/.gitignore b/.gitignore index 1976a72..3a2b88f 100644 --- a/.gitignore +++ b/.gitignore @@ -301,9 +301,3 @@ __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 e8120a4a0f701d60f564af59fbae33e20dde7243..d9df314a71c196947b8754800eaca29588ed7af7 100644 GIT binary patch delta 9193 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 RJW patch - Harvest Organs Post Mortem - 4943.0.1.3 + 4943.0.1.4 \ No newline at end of file diff --git a/Assemblies/RJW_patch_Autopsy.dll b/Assemblies/RJW_patch_Autopsy.dll index afe97740c3ddb6016a0ca6ab569b3802cda14193..d9df314a71c196947b8754800eaca29588ed7af7 100644 GIT binary patch literal 19512 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 WL*sYq-&7qif1sv6cKd(mf&T&djs%|o diff --git a/Source/RJW_patch_Autopsy.sln b/Source/RJW_patch_Autopsy.sln index fb9c555..62fd520 100644 --- a/Source/RJW_patch_Autopsy.sln +++ b/Source/RJW_patch_Autopsy.sln @@ -1,10 +1,14 @@  Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio Version 16 -VisualStudioVersion = 16.0.31911.196 +# 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}" EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "RimJobWorld.Main", "..\..\rjw-base\1.3\Source\RimJobWorld.Main.csproj", "{22F82FFF-8BD4-4CEE-9F22-C7DA71281E72}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Autopsy", "..\..\RimwoldAutopsy\Source\Autopsy\Autopsy.csproj", "{CDD2AF9A-353D-4313-A9EF-517BF4547D3A}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU @@ -15,6 +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 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/Source/RJW_patch_Autopsy/Patches/NewMedicalRecipesUtilityPatch.cs b/Source/RJW_patch_Autopsy/Patches/NewMedicalRecipesUtilityPatch.cs index ae87c4d..a11bf78 100644 --- a/Source/RJW_patch_Autopsy/Patches/NewMedicalRecipesUtilityPatch.cs +++ b/Source/RJW_patch_Autopsy/Patches/NewMedicalRecipesUtilityPatch.cs @@ -8,12 +8,22 @@ using HarmonyLib; namespace RJW_patch_Autopsy { - [HarmonyPatch(typeof(NewMedicalRecipesUtility), "TraverseBody")] + [HarmonyPatch(typeof(NewMedicalRecipesUtility), nameof(NewMedicalRecipesUtility.TraverseBody))] public static class NewMedicalRecipesUtilityPatch { + private const bool DO_LOG = false; + + private static void log(String message) + { + if (DO_LOG) + { + Log.Message(message); + } + } + [HarmonyPostfix] - public static void AddRjwParts(RecipeInfo recipeInfo, Corpse corpse, float skillChance, - ref IEnumerable __result) + public static IEnumerable AddRjwParts(IEnumerable __result, RecipeInfo recipeInfo, Corpse corpse, + float skillChance) { /*//Collect vanilla parts var core = corpse.InnerPawn.RaceProps.body.corePart; @@ -36,7 +46,7 @@ namespace RJW_patch_Autopsy NewMedicalRecipesUtility.DamageHarvested(corpse.InnerPawn, part); */ var results = __result.ToList(); - Log.Message($"Collected {results.Count} vanilla parts"); + log($"Collected {results.Count} vanilla parts"); //Collect rjw rediffs var rjwNaturalDiffs = (from x in corpse.InnerPawn.health.hediffSet.hediffs @@ -46,7 +56,7 @@ namespace RJW_patch_Autopsy where x is Hediff_PartBaseArtifical select x).ToList(); - Log.Message($"Collected {rjwNaturalDiffs.Count} natural and {rjwArtificialDiffs.Count} artificial hediffs"); + log($"Collected {rjwNaturalDiffs.Count} natural and {rjwArtificialDiffs.Count} artificial hediffs"); //Collect parts from hediffs rjw's surgery methods var rjwNaturalThings = rjwNaturalDiffs.Select(hediff => @@ -62,7 +72,7 @@ namespace RJW_patch_Autopsy return tmp; }).ToList(); - Log.Message( + log( $"Collected {rjwNaturalThings.Count} things from {rjwNaturalDiffs.Count} natural and {rjwArtificialThings.Count} things from {rjwArtificialDiffs.Count} artificial hediffs"); //Simulate success chance scaled with skill etc. @@ -82,13 +92,13 @@ namespace RJW_patch_Autopsy if (results.Count > recipeInfo.PartNumber) { var random = new Random(); - __result = results.OrderBy(i => random.Next()).Take(recipeInfo.PartNumber); - } - else - { - __result = results; + results = results.OrderBy(i => random.Next()).Take(recipeInfo.PartNumber).ToList(); } + foreach (var result in results) + { + yield return result; + } // return false; } } diff --git a/Source/RJW_patch_Autopsy/Properties/AssemblyInfo.cs b/Source/RJW_patch_Autopsy/Properties/AssemblyInfo.cs index 62ae99e..648c1dc 100644 --- a/Source/RJW_patch_Autopsy/Properties/AssemblyInfo.cs +++ b/Source/RJW_patch_Autopsy/Properties/AssemblyInfo.cs @@ -11,7 +11,7 @@ using System.Runtime.InteropServices; [assembly: AssemblyConfiguration("")] [assembly: AssemblyCompany("")] [assembly: AssemblyProduct("RJW_patch_Autopsy")] -[assembly: AssemblyCopyright("©2021 Stardust3D")] +[assembly: AssemblyCopyright("©2022 Stardust3D")] [assembly: AssemblyTrademark("")] [assembly: AssemblyCulture("")] @@ -33,5 +33,5 @@ using System.Runtime.InteropServices; // 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.3")] -[assembly: AssemblyFileVersion("4943.0.1.3")] \ No newline at end of file +[assembly: AssemblyVersion("4943.0.1.4")] +[assembly: AssemblyFileVersion("4943.0.1.4")] \ 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 b7550b7..da46f81 100644 --- a/Source/RJW_patch_Autopsy/RJW_patch_Autopsy.csproj +++ b/Source/RJW_patch_Autopsy/RJW_patch_Autopsy.csproj @@ -1,88 +1,94 @@  - - - 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 + + + RJW_patch_Autopsy.snk + + + 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 + + + ..\..\..\..\..\..\workshop\content\294100\818773962\Assemblies\HugsLib.dll + False + + + + + + + + + + + + About\About.xml + + + About\Manifest.xml + + + + + + + + + {f17c6b3f-ba9d-4133-a201-1265a64bcb71} + Autopsy + + + {22f82fff-8bd4-4cee-9f22-c7da71281e72} + RimJobWorld.Main + + + \ No newline at end of file diff --git a/Source/RJW_patch_Autopsy/RJW_patch_Autopsy.snk b/Source/RJW_patch_Autopsy/RJW_patch_Autopsy.snk new file mode 100644 index 0000000000000000000000000000000000000000..f2804cb754b522cc4a72790a4d94827a9c316ef6 GIT binary patch literal 1172 zcmV;F1Z(>T0ssI2Bme+XQ$aES2mk;900968D;c&F zhH}H*;#_kh&U)HgAJT07D&iwi(_6Nf_#2pe>n!ma(JGBj&c1}Es|3eES0vneXA8UJ zPZ9!@L(0s~zU>3X{o{#}9dn2!pWm2n%#S`@C_2Q+e}~kvXE}3X8+GE2^%I*_v^(aW zWzBXTudo$bhX=oPgpnN(7_8sbT@tLki@BBKP)@&?aEhiX1}yCoTTFNH@hUF9fM9g1 zvoa$y!t3(VhQdZUy-1n-XWnQbE#71OAb@NoWk}dz&G9bM_PSz>HW~s}q_7V9pPVD* zGob*35*A3omq5jUe+j0c)ltw$wKv>%hH84Go*wl{TQ{Zbc%GlO!bEI1 zxfDX6cOz?ln-I6DuNz|=t>QsW{1Q`B-fqgN6Lv%Fgemmz^TN>uGqbIpU!hKJ-%fXYuLglwGs5zcYShx=R;&_k1JC-`%0555Aeq_S>QHt*3y2TdGa|HksCZ&tH% z>^s?IK~|)%1E}PEo2GT&66dR7?zIVu@Zg&5I*ZAgLP|=|A|Pj2ZDv%R2R} zlb8o>j*gdT(Z9zT?RD#17#@|3G_O0SASsS;62b`E zorNbzA_W;-=6CH8_bDsrA%cOccDDH%@XeYnnk^>rlXmrOm3fvk_DquV@{06}&(`7Z zzvk-k5ax=1o5Jft_Y=5qH=Dd_1r#6*+f#$SnsGdrlsM1J54V$SS~YPH0&DCS@*ywZQgQ68+S8BQoP-cLyH3R@D8RyN3Bvoh(E4na)dw zM%#QmX9vm&{PBzIXI)c7_2iC4^X+pG(7f4DUcJJsoUyDwwwhl7x?ZgI3Y?W&cVOT< z$7bu7Gd5e@%CAhwd?LebBGy@W4)Le8!Y5DvR==|*|DGRQ$V~kU1wMvd)_`oD8LQOE4))sCE0#jzqj<-@c?2("buildC#") {