diff --git a/1.3/Assemblies/RJW_PlasticSurgeries.dll b/1.3/Assemblies/RJW_PlasticSurgeries.dll index b3f492d..a569982 100644 Binary files a/1.3/Assemblies/RJW_PlasticSurgeries.dll and b/1.3/Assemblies/RJW_PlasticSurgeries.dll differ diff --git a/1.4/Assemblies/RJW_PlasticSurgeries.dll b/1.4/Assemblies/RJW_PlasticSurgeries.dll index 6e2c66f..3c230e0 100644 Binary files a/1.4/Assemblies/RJW_PlasticSurgeries.dll and b/1.4/Assemblies/RJW_PlasticSurgeries.dll differ diff --git a/1.5/Assemblies/RJW_PlasticSurgeries.dll b/1.5/Assemblies/RJW_PlasticSurgeries.dll index 5228e86..e2ba071 100644 Binary files a/1.5/Assemblies/RJW_PlasticSurgeries.dll and b/1.5/Assemblies/RJW_PlasticSurgeries.dll differ diff --git a/About/About.xml b/About/About.xml index dfd4a34..9a60bb7 100644 --- a/About/About.xml +++ b/About/About.xml @@ -6,6 +6,7 @@
  • 1.3
  • 1.4
  • +
  • 1.5
  • Stardust3D.RJW.PlasticSurgeries Surgically alter pawn's genitals. diff --git a/About/Manifest.xml b/About/Manifest.xml index c35b410..cb86e88 100644 --- a/About/Manifest.xml +++ b/About/Manifest.xml @@ -2,5 +2,5 @@ RJW PlasticSurgeries - 5390.0.1.6 + 5400.0.1.7 \ No newline at end of file diff --git a/Source/RJW_PlasticSurgeries/1.5/Recipe_Plastic_Surgery.cs b/Source/RJW_PlasticSurgeries/1.5/Recipe_Plastic_Surgery.cs index af5d873..2304c8c 100644 --- a/Source/RJW_PlasticSurgeries/1.5/Recipe_Plastic_Surgery.cs +++ b/Source/RJW_PlasticSurgeries/1.5/Recipe_Plastic_Surgery.cs @@ -7,7 +7,7 @@ namespace RJW_PlasticSurgeries { public abstract class Recipe_Plastic_Surgery : Recipe_Surgery { - protected readonly bool HasDyspareunia = ModLister.HasActiveModWithName("Dyspareunia"); + protected readonly bool HasDyspareunia = false; // ModLister.HasActiveModWithName("Dyspareunia"); protected readonly bool HasLicentia = ModLister.HasActiveModWithName("RimJobWorld - Licentia Labs"); public override IEnumerable GetPartsToApplyOn(Pawn pawn, RecipeDef recipe) diff --git a/Source/RJW_PlasticSurgeries/About/About.xml b/Source/RJW_PlasticSurgeries/About/About.xml index dfd4a34..9a60bb7 100644 --- a/Source/RJW_PlasticSurgeries/About/About.xml +++ b/Source/RJW_PlasticSurgeries/About/About.xml @@ -6,6 +6,7 @@
  • 1.3
  • 1.4
  • +
  • 1.5
  • Stardust3D.RJW.PlasticSurgeries Surgically alter pawn's genitals. diff --git a/Source/RJW_PlasticSurgeries/About/Manifest.xml b/Source/RJW_PlasticSurgeries/About/Manifest.xml index c35b410..cb86e88 100644 --- a/Source/RJW_PlasticSurgeries/About/Manifest.xml +++ b/Source/RJW_PlasticSurgeries/About/Manifest.xml @@ -2,5 +2,5 @@ RJW PlasticSurgeries - 5390.0.1.6 + 5400.0.1.7 \ No newline at end of file diff --git a/Source/RJW_PlasticSurgeries/RJW_PlasticSurgeries_1.3.csproj b/Source/RJW_PlasticSurgeries/RJW_PlasticSurgeries_1.3.csproj index e82420f..05a3460 100644 --- a/Source/RJW_PlasticSurgeries/RJW_PlasticSurgeries_1.3.csproj +++ b/Source/RJW_PlasticSurgeries/RJW_PlasticSurgeries_1.3.csproj @@ -15,8 +15,8 @@ 11 ©2024 Stardust3D Stardust3D - 5390.0.1.6 - 5390.0.1.6 + 5400.0.1.7 + 5400.0.1.7 true RJW_PlasticSurgeries.snk Surgically alter pawn's genitals. @@ -31,7 +31,7 @@ - + diff --git a/Source/RJW_PlasticSurgeries/RJW_PlasticSurgeries_1.4.csproj b/Source/RJW_PlasticSurgeries/RJW_PlasticSurgeries_1.4.csproj index 8da69ff..edf45b8 100644 --- a/Source/RJW_PlasticSurgeries/RJW_PlasticSurgeries_1.4.csproj +++ b/Source/RJW_PlasticSurgeries/RJW_PlasticSurgeries_1.4.csproj @@ -15,8 +15,8 @@ 11 ©2024 Stardust3D Stardust3D - 5390.0.1.6 - 5390.0.1.6 + 5400.0.1.7 + 5400.0.1.7 true RJW_PlasticSurgeries.snk Surgically alter pawn's genitals. @@ -31,7 +31,7 @@ - + diff --git a/Source/RJW_PlasticSurgeries/RJW_PlasticSurgeries_1.5.csproj b/Source/RJW_PlasticSurgeries/RJW_PlasticSurgeries_1.5.csproj index 9f7747a..0fa1757 100644 --- a/Source/RJW_PlasticSurgeries/RJW_PlasticSurgeries_1.5.csproj +++ b/Source/RJW_PlasticSurgeries/RJW_PlasticSurgeries_1.5.csproj @@ -15,8 +15,8 @@ 11 ©2024 Stardust3D Stardust3D - 5390.0.1.6 - 5390.0.1.6 + 5400.0.1.7 + 5400.0.1.7 true RJW_PlasticSurgeries.snk Surgically alter pawn's genitals. @@ -31,8 +31,8 @@ - - + + @@ -43,7 +43,7 @@ ..\..\..\licentia-labs\Assemblies\LicentiaLabs.dll - ..\..\..\rjw-beta\1.5\Assemblies\RJW.dll + ..\..\..\rjw-base\1.5\Assemblies\RJW.dll diff --git a/Source/RJW_PlasticSurgeries/Recipe_Surgery_Penoplasty.cs b/Source/RJW_PlasticSurgeries/Recipe_Surgery_Penoplasty.cs index 3e11c72..3a2408b 100644 --- a/Source/RJW_PlasticSurgeries/Recipe_Surgery_Penoplasty.cs +++ b/Source/RJW_PlasticSurgeries/Recipe_Surgery_Penoplasty.cs @@ -1,4 +1,5 @@ -using System.Collections.Generic; +using System; +using System.Collections.Generic; using LicentiaLabs; using rjw; using Verse; @@ -23,8 +24,15 @@ namespace RJW_PlasticSurgeries return pawn.GetGenitalsList().FindAll(Genital_Helper.is_penis); } - protected override (HediffDef, float) GetLicentiaDamage() => - (Licentia.HediffDefs.StretchTear, 0.2f); + protected override (HediffDef, float) GetLicentiaDamage() + { + if (HasLicentia) + { + return (Licentia.HediffDefs.StretchTear, 0.2f); + } + + throw new NotSupportedException(); + } } public class Recipe_Surgery_Penoplasty_Micro : Recipe_Surgery_Penoplasty diff --git a/Source/RJW_PlasticSurgeries/Recipe_Surgery_Sphinctoplasty.cs b/Source/RJW_PlasticSurgeries/Recipe_Surgery_Sphinctoplasty.cs index 796268f..fbbd9ae 100644 --- a/Source/RJW_PlasticSurgeries/Recipe_Surgery_Sphinctoplasty.cs +++ b/Source/RJW_PlasticSurgeries/Recipe_Surgery_Sphinctoplasty.cs @@ -1,4 +1,5 @@ -using System.Collections.Generic; +using System; +using System.Collections.Generic; using LicentiaLabs; using rjw; using Verse; @@ -21,9 +22,16 @@ namespace RJW_PlasticSurgeries { return pawn.GetAnusList(); } - - protected override (HediffDef, float) GetLicentiaDamage() => - (Licentia.HediffDefs.StretchTear, 0.2f); + + protected override (HediffDef, float) GetLicentiaDamage() + { + if (HasLicentia) + { + return (Licentia.HediffDefs.StretchTear, 0.2f); + } + + throw new NotSupportedException(); + } } 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 68a7803..33f13fc 100644 --- a/Source/RJW_PlasticSurgeries/Recipe_Surgery_Vaginoplasty.cs +++ b/Source/RJW_PlasticSurgeries/Recipe_Surgery_Vaginoplasty.cs @@ -1,4 +1,5 @@ -using System.Collections.Generic; +using System; +using System.Collections.Generic; using LicentiaLabs; using rjw; using Verse; @@ -21,9 +22,16 @@ namespace RJW_PlasticSurgeries { return pawn.GetGenitalsList().FindAll(Genital_Helper.is_vagina); } - - protected override (HediffDef, float) GetLicentiaDamage() => - (Licentia.HediffDefs.StretchTear, 0.2f); + + protected override (HediffDef, float) GetLicentiaDamage() + { + if (HasLicentia) + { + return (Licentia.HediffDefs.StretchTear, 0.2f); + } + + throw new NotSupportedException(); + } } public class Recipe_Surgery_Vaginoplasty_Micro : Recipe_Surgery_Vaginoplasty