From 2b05dfac95335fa6fdc19307f107a0e1d5608618 Mon Sep 17 00:00:00 2001 From: Stardust3D <3dstardust@gmail.com> Date: Sat, 18 Dec 2021 02:32:26 +0100 Subject: [PATCH] cleanup --- 1.3/Assemblies/RJW_patch_Autopsy.dll | Bin 9216 -> 9216 bytes Assemblies/RJW_patch_Autopsy.dll | Bin 9216 -> 9216 bytes .../Autopsy RJW Patch.csproj | 7 +++ Source/RJW_patch_Autopsy/Mod.cs | 1 - Source/RJW_patch_Autopsy/Patches/Harmony.cs | 2 +- .../Patches/NewMedicalRecipesUtilityPatch.cs | 55 +++++++++++------- .../Properties/AssemblyInfo.cs | 4 +- 7 files changed, 43 insertions(+), 26 deletions(-) diff --git a/1.3/Assemblies/RJW_patch_Autopsy.dll b/1.3/Assemblies/RJW_patch_Autopsy.dll index 2405fa21e0555474bfb5e6d35e2bbeddb7a72dde..092b8e0c026bc37fdea4e35573383bc281013300 100644 GIT binary patch delta 2390 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 diff --git a/Assemblies/RJW_patch_Autopsy.dll b/Assemblies/RJW_patch_Autopsy.dll index 2405fa21e0555474bfb5e6d35e2bbeddb7a72dde..092b8e0c026bc37fdea4e35573383bc281013300 100644 GIT binary patch delta 2390 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 diff --git a/Source/RJW_patch_Autopsy/Autopsy RJW Patch.csproj b/Source/RJW_patch_Autopsy/Autopsy RJW Patch.csproj index df29d59..dc5ab98 100644 --- a/Source/RJW_patch_Autopsy/Autopsy RJW Patch.csproj +++ b/Source/RJW_patch_Autopsy/Autopsy RJW Patch.csproj @@ -41,6 +41,12 @@ true + + true + + + false + ..\packages\Lib.Harmony.2.1.1\lib\net472\0Harmony.dll @@ -86,6 +92,7 @@ + \ No newline at end of file diff --git a/Source/RJW_patch_Autopsy/Mod.cs b/Source/RJW_patch_Autopsy/Mod.cs index 98f6bfe..9c0543b 100644 --- a/Source/RJW_patch_Autopsy/Mod.cs +++ b/Source/RJW_patch_Autopsy/Mod.cs @@ -5,6 +5,5 @@ namespace RJW_patch_Autopsy public class Mod : ModBase { public override string ModIdentifier => "Stardust3D.RJW.patch.Autopsy"; - } } \ No newline at end of file diff --git a/Source/RJW_patch_Autopsy/Patches/Harmony.cs b/Source/RJW_patch_Autopsy/Patches/Harmony.cs index 4af076b..2abc5c6 100644 --- a/Source/RJW_patch_Autopsy/Patches/Harmony.cs +++ b/Source/RJW_patch_Autopsy/Patches/Harmony.cs @@ -13,4 +13,4 @@ namespace RJW_patch_Autopsy har.PatchAll(Assembly.GetExecutingAssembly()); } } -} +} \ 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 633149c..083c620 100644 --- a/Source/RJW_patch_Autopsy/Patches/NewMedicalRecipesUtilityPatch.cs +++ b/Source/RJW_patch_Autopsy/Patches/NewMedicalRecipesUtilityPatch.cs @@ -12,45 +12,56 @@ namespace RJW_patch_Autopsy public static class NewMedicalRecipesUtilityPatch { [HarmonyPrefix] - public static bool AddRjwParts(RecipeInfo recipeInfo, Corpse corpse, float skillChance, ref IEnumerable __result) + public static bool AddRjwParts(RecipeInfo recipeInfo, Corpse corpse, float skillChance, + ref IEnumerable __result) { //Collect vanilla parts - BodyPartRecord core = corpse.InnerPawn.RaceProps.body.corePart; - List queue = new List { core }; - HediffSet hediffSet = corpse.InnerPawn.health.hediffSet; - List results = new List(); - List damagedParts = new List(); + var core = corpse.InnerPawn.RaceProps.body.corePart; + var queue = new List {core}; + var hediffSet = corpse.InnerPawn.health.hediffSet; + var results = new List(); + var damagedParts = new List(); while (queue.Count > 0) { - BodyPartRecord part = queue.First(); + var part = queue.First(); queue.Remove(part); //Drop parts and bionics that are higher on the body tree. - if (NewMedicalRecipesUtility.TryGetParts(corpse, recipeInfo, part, skillChance, ref results, ref damagedParts) && core != part) + if (NewMedicalRecipesUtility.TryGetParts(corpse, recipeInfo, part, skillChance, ref results, + ref damagedParts) && core != part) continue; queue.AddRange(part.parts.Where(x => !hediffSet.PartIsMissing(x))); } - foreach (BodyPartRecord part in damagedParts) NewMedicalRecipesUtility.DamageHarvested(corpse.InnerPawn, part); + foreach (var part in damagedParts) + NewMedicalRecipesUtility.DamageHarvested(corpse.InnerPawn, part); //Collect rjw rediffs - List rjwNaturalDiffs = (from x in corpse.InnerPawn.health.hediffSet.hediffs - where x is Hediff_PartBaseNatural - select x).ToList(); - List rjwArtificialDiffs = (from x in corpse.InnerPawn.health.hediffSet.hediffs - where x is Hediff_PartBaseArtifical - select x).ToList(); + var rjwNaturalDiffs = (from x in corpse.InnerPawn.health.hediffSet.hediffs + where x is Hediff_PartBaseNatural + select x).ToList(); + var rjwArtificialDiffs = (from x in corpse.InnerPawn.health.hediffSet.hediffs + where x is Hediff_PartBaseArtifical + select x).ToList(); //Log.Message(String.Format("Collected {0} natural and {1} artifical hediffs", rjwNaturalDiffs.Count(), rjwArtificialDiffs.Count())); //Collect parts from hediffs rjw's surgery methods - List rjwNaturalThings = rjwNaturalDiffs.Select(d => SexPartAdder.recipePartRemover(d)).ToList(); - List rjwArtificialThings = rjwArtificialDiffs.Select(d => SexPartAdder.recipePartRemover(d)).ToList(); + var rjwNaturalThings = rjwNaturalDiffs.Select(SexPartAdder.recipePartRemover).ToList(); + var rjwArtificialThings = + rjwArtificialDiffs.Select(SexPartAdder.recipePartRemover).ToList(); - //Log.Message(String.Format("Collected {0} things from {1} natural and {2} things from {3} artifical hediffs", rjwArtificialThings.Count(), rjwNaturalDiffs.Count(), rjwArtificialThings.Count(), rjwArtificialDiffs.Count())); + //Log.Message(String.Format("Collected {0} things from {1} natural and {2} things from {3} artifical hediffs", + //rjwArtificialThings.Count(), rjwNaturalDiffs.Count(), rjwArtificialThings.Count(), rjwArtificialDiffs.Count())); //Simulate success chance scaled with skill etc. - rjwNaturalThings.ToList().ForEach(t => { if (Rand.Chance(Math.Min(skillChance, recipeInfo.NaturalChance))) results.Add(t); }); - rjwArtificialThings.ToList().ForEach(t => { if (Rand.Chance(Math.Min(skillChance, recipeInfo.BionicChance))) results.Add(t); }); + rjwNaturalThings.ToList().ForEach(t => + { + if (Rand.Chance(Math.Min(skillChance, recipeInfo.NaturalChance))) results.Add(t); + }); + rjwArtificialThings.ToList().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)); @@ -58,7 +69,7 @@ namespace RJW_patch_Autopsy if (results.Count() > recipeInfo.PartNumber) { - Random random = new Random(); + var random = new Random(); __result = results.OrderBy(i => random.Next()).Take(recipeInfo.PartNumber); } else @@ -69,4 +80,4 @@ namespace RJW_patch_Autopsy return false; } } -} +} \ No newline at end of file diff --git a/Source/RJW_patch_Autopsy/Properties/AssemblyInfo.cs b/Source/RJW_patch_Autopsy/Properties/AssemblyInfo.cs index 17077c1..1cba23f 100644 --- a/Source/RJW_patch_Autopsy/Properties/AssemblyInfo.cs +++ b/Source/RJW_patch_Autopsy/Properties/AssemblyInfo.cs @@ -31,5 +31,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("493.0.1.1")] -[assembly: AssemblyFileVersion("493.0.1.1")] \ No newline at end of file +[assembly: AssemblyVersion("493.0.1.2")] +[assembly: AssemblyFileVersion("493.0.1.2")] \ No newline at end of file