diff --git a/1.3/Assemblies/RJW_PlasticSurgeries.dll b/1.3/Assemblies/RJW_PlasticSurgeries.dll index 9e0e3e6..1800585 100644 Binary files a/1.3/Assemblies/RJW_PlasticSurgeries.dll and b/1.3/Assemblies/RJW_PlasticSurgeries.dll differ diff --git a/About/Manifest.xml b/About/Manifest.xml index 5abb061..6a73738 100644 --- a/About/Manifest.xml +++ b/About/Manifest.xml @@ -2,5 +2,5 @@ RJW PlasticSurgeries - 4943.0.1.4 + 4945.0.1.5 \ No newline at end of file diff --git a/Assemblies/RJW_PlasticSurgeries.dll b/Assemblies/RJW_PlasticSurgeries.dll index 9e0e3e6..1800585 100644 Binary files a/Assemblies/RJW_PlasticSurgeries.dll and b/Assemblies/RJW_PlasticSurgeries.dll differ diff --git a/Source/RJW_PlasticSurgeries/Properties/AssemblyInfo.cs b/Source/RJW_PlasticSurgeries/Properties/AssemblyInfo.cs index 911e560..5e16882 100644 --- a/Source/RJW_PlasticSurgeries/Properties/AssemblyInfo.cs +++ b/Source/RJW_PlasticSurgeries/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("4943.0.1.5")] -[assembly: AssemblyFileVersion("4943.0.1.5")] \ No newline at end of file +[assembly: AssemblyVersion("4945.0.1.5")] +[assembly: AssemblyFileVersion("4945.0.1.5")] \ No newline at end of file diff --git a/Source/RJW_PlasticSurgeries/Recipe_Surgery_Sphinctoplasty.cs b/Source/RJW_PlasticSurgeries/Recipe_Surgery_Sphinctoplasty.cs index c2f1e83..1ceef5c 100644 --- a/Source/RJW_PlasticSurgeries/Recipe_Surgery_Sphinctoplasty.cs +++ b/Source/RJW_PlasticSurgeries/Recipe_Surgery_Sphinctoplasty.cs @@ -10,6 +10,8 @@ namespace RJW_PlasticSurgeries { public abstract class Recipe_Surgery_Sphinctoplasty : Recipe_Surgery { + private readonly bool hasDyspareunia = ModLister.HasActiveModWithName("Dyspareunia"); + public override IEnumerable GetPartsToApplyOn(Pawn pawn, RecipeDef recipe) { var part = Genital_Helper.get_anusBPR(pawn); @@ -38,16 +40,17 @@ namespace RJW_PlasticSurgeries pawn.GetAnusList().ForEach(hed => { hed.Severity = severity; - try + if (hasDyspareunia) { - PenetrationUtility.AddDamageHediff(DamageDefOf.SexStretch, 0.5f, hed, null); - } - catch (Exception e) - { - Log.Error("Try enabling Dyspareunia for sore genitals"); + DamageHediff(hed); } }); } + + private static void DamageHediff(Hediff hed) + { + PenetrationUtility.AddDamageHediff(DamageDefOf.SexStretch, 0.5f, hed, null); + } } public class Recipe_Surgery_Sphinctoplasty_Micro : Recipe_Surgery_Sphinctoplasty diff --git a/Source/RJW_PlasticSurgeries/Recipe_Surgery_Vaginoplasty.cs b/Source/RJW_PlasticSurgeries/Recipe_Surgery_Vaginoplasty.cs index 14938c5..73209ca 100644 --- a/Source/RJW_PlasticSurgeries/Recipe_Surgery_Vaginoplasty.cs +++ b/Source/RJW_PlasticSurgeries/Recipe_Surgery_Vaginoplasty.cs @@ -10,6 +10,8 @@ namespace RJW_PlasticSurgeries { public abstract class Recipe_Surgery_Vaginoplasty : Recipe_Surgery { + private readonly bool hasDyspareunia = ModLister.HasActiveModWithName("Dyspareunia"); + public override IEnumerable GetPartsToApplyOn(Pawn pawn, RecipeDef recipe) { var part = Genital_Helper.get_genitalsBPR(pawn); @@ -38,16 +40,17 @@ namespace RJW_PlasticSurgeries pawn.GetGenitalsList().FindAll(Genital_Helper.is_vagina).ForEach(hed => { hed.Severity = severity; - try + if (hasDyspareunia) { - PenetrationUtility.AddDamageHediff(DamageDefOf.SexStretch, 0.5f, hed, null); - } - catch (Exception e) - { - Log.Error("Try enabling Dyspareunia for sore genitals"); + DamageHediff(hed); } }); } + + private static void DamageHediff(Hediff hed) + { + PenetrationUtility.AddDamageHediff(DamageDefOf.SexStretch, 0.5f, hed, null); + } } public class Recipe_Surgery_Vaginoplasty_Micro : Recipe_Surgery_Vaginoplasty diff --git a/Source/build.gradle.kts b/Source/build.gradle.kts index 41f2ff5..c54bd29 100644 --- a/Source/build.gradle.kts +++ b/Source/build.gradle.kts @@ -11,7 +11,7 @@ plugins { //id("com.ullink.nunit") version "1.12" } -version = "4943.0.1.5" +version = "4945.0.1.5" val friendlyName = "rjw-plasticsurgeries" tasks.register("buildC#") {