diff --git a/RJW-Genes-Addons/Common/Assemblies/shabe_genesaddons.dll b/RJW-Genes-Addons/Common/Assemblies/shabe_genesaddons.dll index d8676e6..964581c 100644 Binary files a/RJW-Genes-Addons/Common/Assemblies/shabe_genesaddons.dll and b/RJW-Genes-Addons/Common/Assemblies/shabe_genesaddons.dll differ diff --git a/RJW-Genes-Addons/Common/Defs/AbilityDefs/Abilities.xml b/RJW-Genes-Addons/Common/Defs/AbilityDefs/Abilities.xml index 828fb4a..4ed7417 100644 --- a/RJW-Genes-Addons/Common/Defs/AbilityDefs/Abilities.xml +++ b/RJW-Genes-Addons/Common/Defs/AbilityDefs/Abilities.xml @@ -27,7 +27,7 @@ -
  • +
  • 0.4~0.8
  • diff --git a/RJW-Genes-Addons/Source/shabe_genesaddons/.vs/shabe_genesaddons/FileContentIndex/8711bc8a-ff12-4161-a7a7-bd9c056971b5.vsidx b/RJW-Genes-Addons/Source/shabe_genesaddons/.vs/shabe_genesaddons/FileContentIndex/98033c9f-5881-4845-ab6a-d2392c3cbaed.vsidx similarity index 87% rename from RJW-Genes-Addons/Source/shabe_genesaddons/.vs/shabe_genesaddons/FileContentIndex/8711bc8a-ff12-4161-a7a7-bd9c056971b5.vsidx rename to RJW-Genes-Addons/Source/shabe_genesaddons/.vs/shabe_genesaddons/FileContentIndex/98033c9f-5881-4845-ab6a-d2392c3cbaed.vsidx index bbcf74e..4966fd2 100644 Binary files a/RJW-Genes-Addons/Source/shabe_genesaddons/.vs/shabe_genesaddons/FileContentIndex/8711bc8a-ff12-4161-a7a7-bd9c056971b5.vsidx and b/RJW-Genes-Addons/Source/shabe_genesaddons/.vs/shabe_genesaddons/FileContentIndex/98033c9f-5881-4845-ab6a-d2392c3cbaed.vsidx differ diff --git a/RJW-Genes-Addons/Source/shabe_genesaddons/.vs/shabe_genesaddons/v17/.suo b/RJW-Genes-Addons/Source/shabe_genesaddons/.vs/shabe_genesaddons/v17/.suo index 239e672..422fcf6 100644 Binary files a/RJW-Genes-Addons/Source/shabe_genesaddons/.vs/shabe_genesaddons/v17/.suo and b/RJW-Genes-Addons/Source/shabe_genesaddons/.vs/shabe_genesaddons/v17/.suo differ diff --git a/RJW-Genes-Addons/Source/shabe_genesaddons/CompAbilityEffect_PussyHeal.cs b/RJW-Genes-Addons/Source/shabe_genesaddons/CompAbilityEffect_PussyHeal.cs index 65af326..959a871 100644 --- a/RJW-Genes-Addons/Source/shabe_genesaddons/CompAbilityEffect_PussyHeal.cs +++ b/RJW-Genes-Addons/Source/shabe_genesaddons/CompAbilityEffect_PussyHeal.cs @@ -6,16 +6,17 @@ using System.Threading.Tasks; using Verse; using UnityEngine; using RimWorld; +using rjw; namespace shabe_genesaddons { public class CompAbilityEffect_PussyHeal : CompAbilityEffect { - private new CompProperties_AbilityCoagulate Props + private new CompProperties_AbilityPussyHeal Props { get { - return (CompProperties_AbilityCoagulate)this.props; + return (CompProperties_AbilityPussyHeal)this.props; } } public override void Apply(LocalTargetInfo target, LocalTargetInfo dest) @@ -45,10 +46,20 @@ namespace shabe_genesaddons public override bool Valid(LocalTargetInfo target, bool throwMessages = false) { - Pawn pawn = target.Pawn; + Pawn pawn = target.Pawn; if (pawn != null) { - AbilityUtility.ValidateHasTendableWound(pawn, throwMessages, this.parent); + //to be replaced with severel checks to make it clear why target is unable to have sex + if (!CasualSex_Helper.CanHaveSex(pawn)) + { + if (throwMessages) + { + Messages.Message(pawn.Name + " is unable to have sex", pawn, MessageTypeDefOf.RejectInput, false); + } + return false; + } + AbilityUtility.ValidateHasTendableWound(pawn, throwMessages, this.parent); + } return base.Valid(target, throwMessages); } diff --git a/RJW-Genes-Addons/Source/shabe_genesaddons/CompProperties_AbilityPussyHeal.cs b/RJW-Genes-Addons/Source/shabe_genesaddons/CompProperties_AbilityPussyHeal.cs index 09ba23d..292273e 100644 --- a/RJW-Genes-Addons/Source/shabe_genesaddons/CompProperties_AbilityPussyHeal.cs +++ b/RJW-Genes-Addons/Source/shabe_genesaddons/CompProperties_AbilityPussyHeal.cs @@ -8,16 +8,13 @@ using RimWorld; namespace shabe_genesaddons { - // Token: 0x02000F2B RID: 3883 public class CompProperties_AbilityPussyHeal : CompProperties_AbilityEffect { - // Token: 0x06005C32 RID: 23602 RVA: 0x001F45C9 File Offset: 0x001F27C9 public CompProperties_AbilityPussyHeal() { - this.compClass = typeof(CompAbilityEffect_Coagulate); + this.compClass = typeof(CompAbilityEffect_PussyHeal); } - // Token: 0x0400386B RID: 14443 public FloatRange tendQualityRange; } } diff --git a/RJW-Genes-Addons/Source/shabe_genesaddons/obj/Debug/shabe_genesaddons.dll b/RJW-Genes-Addons/Source/shabe_genesaddons/obj/Debug/shabe_genesaddons.dll index d8676e6..964581c 100644 Binary files a/RJW-Genes-Addons/Source/shabe_genesaddons/obj/Debug/shabe_genesaddons.dll and b/RJW-Genes-Addons/Source/shabe_genesaddons/obj/Debug/shabe_genesaddons.dll differ