From 90653ddc9e60c239f2c59cb621309ef608ba4068 Mon Sep 17 00:00:00 2001 From: Vegapnk Date: Thu, 30 May 2024 08:26:40 +0200 Subject: [PATCH] Removed Sadist for now --- .../Defs/GeneDefs/GeneDefs_Reproduction.xml | 4 +- Common/Defs/TraitDefs/Traits_Singular.xml | 32 ------ Common/Patches/Traits/Patch_Sadist.xml | 105 ------------------ Source/Common/patches/PatchImplants.cs | 4 +- Source/Rjw-Genes.csproj | 19 +++- 5 files changed, 23 insertions(+), 141 deletions(-) delete mode 100644 Common/Defs/TraitDefs/Traits_Singular.xml delete mode 100644 Common/Patches/Traits/Patch_Sadist.xml diff --git a/Common/Defs/GeneDefs/GeneDefs_Reproduction.xml b/Common/Defs/GeneDefs/GeneDefs_Reproduction.xml index 63b1100..454d9eb 100644 --- a/Common/Defs/GeneDefs/GeneDefs_Reproduction.xml +++ b/Common/Defs/GeneDefs/GeneDefs_Reproduction.xml @@ -44,6 +44,7 @@ + + rjw_genes_masochist diff --git a/Common/Defs/TraitDefs/Traits_Singular.xml b/Common/Defs/TraitDefs/Traits_Singular.xml deleted file mode 100644 index 3f739cf..0000000 --- a/Common/Defs/TraitDefs/Traits_Singular.xml +++ /dev/null @@ -1,32 +0,0 @@ - - - - - rjw_genes_sadist - 0.5 - -
  • - - {PAWN_nameDef} is a sadist, enjoying blood and hurting others, may also be a little rapy. - 2 -
  • Morbid
    • - - 0.1 - - RandomRape - - -
  • (0, 15)
    • -
  • (50, 50)
    • -
  • (100, 100)
    • -     -     - -     - -
  • Violent
    • -     -     - - -     diff --git a/Common/Patches/Traits/Patch_Sadist.xml b/Common/Patches/Traits/Patch_Sadist.xml deleted file mode 100644 index c7591d2..0000000 --- a/Common/Patches/Traits/Patch_Sadist.xml +++ /dev/null @@ -1,105 +0,0 @@ - - - - - Defs/ThoughtDef[defName="KnowGuestExecuted"]/nullifyingTraits - -
  • rjw_genes_sadist
    • -     -     - - Defs/ThoughtDef[defName="KnowPrisonerDiedInnocent"]/nullifyingTraits - -
  • rjw_genes_sadist
    • -     -     - - Defs/ThoughtDef[defName="KnowColonistDied"]/nullifyingTraits - -
  • rjw_genes_sadist
    • -     -     - - - - - - Defs/ThoughtDef[defName="HarvestedOrgan_Bloodlust"]/requiredTraits - -
  • rjw_genes_sadist
    • -     -     - - Defs/ThoughtDef[defName="KnowGuestOrganHarvested"]/nullifyingTraits - -
  • rjw_genes_sadist
    • -     -     - - Defs/ThoughtDef[defName="KnowColonistOrganHarvested"]/nullifyingTraits - -
  • rjw_genes_sadist
    • -     -     - - Defs/ThoughtDef[defName="ButcheredHumanlikeCorpse"]/nullifyingTraits - -
  • rjw_genes_sadist
    • -     -     - - Defs/ThoughtDef[defName="KnowButcheredHumanlikeCorpse"]/nullifyingTraits - -
  • rjw_genes_sadist
    • -     -     - - Defs/ThoughtDef[defName="ButcheredHumanlikeCorpseOpinion"]/nullifyingTraits - -
  • rjw_genes_sadist
    • -     -     - - Defs/ThoughtDef[defName="ObservedLayingCorpse"]/nullifyingTraits - -
  • rjw_genes_sadist
    • -     -     - - Defs/ThoughtDef[defName="ObservedLayingRottingCorpse"]/nullifyingTraits - -
  • rjw_genes_sadist
    • -     -     - - Defs/ThoughtDef[defName="WitnessedDeathNonAlly"]/nullifyingTraits - -
  • rjw_genes_sadist
    • -     -     - - Defs/ThoughtDef[defName="KilledHumanlikeBloodlust"]/requiredTraits - -
  • rjw_genes_sadist
    • -     -     - - Defs/ThoughtDef[defName="DeadMansApparel"]/nullifyingTraits - -
  • rjw_genes_sadist
    • -     -     - - Defs/ThoughtDef[defName="HumanLeatherApparelSad"]/nullifyingTraits - -
  • rjw_genes_sadist
    • -     -     - - Defs/ThoughtDef[defName="HumanLeatherApparelHappy"]/requiredTraits - -
  • rjw_genes_sadist
    • -     -     - -     \ No newline at end of file diff --git a/Source/Common/patches/PatchImplants.cs b/Source/Common/patches/PatchImplants.cs index 5cd3c8c..037e081 100644 --- a/Source/Common/patches/PatchImplants.cs +++ b/Source/Common/patches/PatchImplants.cs @@ -18,7 +18,7 @@ namespace RJW_Genes public static readonly ThoughtDef stoleSomeLovin = DefDatabase.GetNamed("StoleSomeLovin"); public static readonly ThoughtDef bloodlustStoleSomeLovin = DefDatabase.GetNamed("BloodlustStoleSomeLovin"); public static readonly TraitDef rapist = DefDatabase.GetNamed("Rapist"); - public static readonly TraitDef sadist = DefDatabase.GetNamed("rjw_genes_sadist"); + static Dictionary laborStateMap = new Dictionary(); static public void would_rape_PostFix(ref bool __result, Pawn rapist) { @@ -54,7 +54,7 @@ namespace RJW_Genes { if (RJW_Genes_Settings.regretStealingLovinThoughtDisabled) return; - if (pawn.health.hediffSet.HasHediff(HediffDef.Named("LimbicStimulator")) && (__result == stoleSomeLovin || __result == bloodlustStoleSomeLovin) && !pawn.story.traits.HasTrait(rapist) && !pawn.story.traits.HasTrait(sadist)) + if (pawn.health.hediffSet.HasHediff(HediffDef.Named("LimbicStimulator")) && (__result == stoleSomeLovin || __result == bloodlustStoleSomeLovin) && !pawn.story.traits.HasTrait(rapist)) { __result = regretsStealingLovin; } diff --git a/Source/Rjw-Genes.csproj b/Source/Rjw-Genes.csproj index 32b5494..11312b8 100644 --- a/Source/Rjw-Genes.csproj +++ b/Source/Rjw-Genes.csproj @@ -27,7 +27,24 @@ - + + + + + + + + + + + + + + + + + +