From f548a48152b2babd64e29bfca9097c5507b6c83e Mon Sep 17 00:00:00 2001 From: Shabakur Date: Sat, 19 Nov 2022 17:07:31 +0100 Subject: [PATCH] Fixed pussyheal and added a check if target is allowed to have sex. --- .../Common/Assemblies/shabe_genesaddons.dll | Bin 12288 -> 12800 bytes .../Common/Defs/AbilityDefs/Abilities.xml | 2 +- ...8033c9f-5881-4845-ab6a-d2392c3cbaed.vsidx} | Bin 12647 -> 12658 bytes .../.vs/shabe_genesaddons/v17/.suo | Bin 33280 -> 59392 bytes .../CompAbilityEffect_PussyHeal.cs | 19 ++++++++++++++---- .../CompProperties_AbilityPussyHeal.cs | 5 +---- .../obj/Debug/shabe_genesaddons.dll | Bin 12288 -> 12800 bytes 7 files changed, 17 insertions(+), 9 deletions(-) rename RJW-Genes-Addons/Source/shabe_genesaddons/.vs/shabe_genesaddons/FileContentIndex/{8711bc8a-ff12-4161-a7a7-bd9c056971b5.vsidx => 98033c9f-5881-4845-ab6a-d2392c3cbaed.vsidx} (87%) diff --git a/RJW-Genes-Addons/Common/Assemblies/shabe_genesaddons.dll b/RJW-Genes-Addons/Common/Assemblies/shabe_genesaddons.dll index d8676e64e5ca0a6f0bccf10c157596b4fd48ef0f..964581c039dc5d0652a76f02e4f83969d2b27021 100644 GIT binary patch delta 4419 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 GTmJ?Id -
  • +
  • 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 bbcf74e274fb4d358c8774480c6579b90bc302c5..4966fd22e802d520e6f5709a077f82949c751f57 100644 GIT binary patch delta 83 zcmaE!^eIWk*~Oiifq}uz5J&(43xr}|1k(B&W$M`&4L8qZ%V%ahvze32UXYPtv!gVh Rm_!f)I5guX8ip#fTt3>p9c delta 79 zcmeyA^gKz%*~Oiifq}u=5J&(43xr}|1kySiW$M{B&tuDFW<0W)hs$1YbFehKn1nwE NL=6WQguWsVp#d=<3()`o 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 239e67236339595f048fcdbc56a0e7ee6d4e682b..422fcf657d5243c4bfa3bf52d8f4943b2a6485c4 100644 GIT binary patch literal 59392 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 pe6+MgOwmLiQ*<{RM>rGz|a% 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 d8676e64e5ca0a6f0bccf10c157596b4fd48ef0f..964581c039dc5d0652a76f02e4f83969d2b27021 100644 GIT binary patch delta 4419 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 GTmJ?Id