mirror of
https://github.com/vegapnk/RJW-Genes.git
synced 2024-08-15 00:23:31 +00:00
Removed Sadist for now
This commit is contained in:
parent
883dfefa3e
commit
90653ddc9e
5 changed files with 23 additions and 141 deletions
|
@ -44,6 +44,7 @@
|
|||
</modExtensions>
|
||||
</GeneDef>
|
||||
|
||||
<!--
|
||||
<GeneDef>
|
||||
<defName>rjw_genes_sadist_gene</defName>
|
||||
<label>Sadist</label>
|
||||
|
@ -65,7 +66,8 @@
|
|||
</li>
|
||||
</modExtensions>
|
||||
</GeneDef>
|
||||
|
||||
-->
|
||||
|
||||
<GeneDef>
|
||||
<defName>rjw_genes_masochist</defName>
|
||||
<label>Masochist</label>
|
||||
|
|
|
@ -1,32 +0,0 @@
|
|||
<?xml version="1.0" encoding="utf-8" ?>
|
||||
<Defs>
|
||||
|
||||
<TraitDef>
|
||||
<defName>rjw_genes_sadist</defName>
|
||||
<commonality>0.5</commonality>
|
||||
<degreeDatas>
|
||||
<li>
|
||||
<label>Sadist</label>
|
||||
<description>{PAWN_nameDef} is a sadist, enjoying blood and hurting others, may also be a little rapy.</description>
|
||||
<socialFightChanceFactor>2</socialFightChanceFactor>
|
||||
<allowedMeditationFocusTypes><li>Morbid</li></allowedMeditationFocusTypes>
|
||||
<statOffsets>
|
||||
<SexFrequency>0.1</SexFrequency>
|
||||
</statOffsets>
|
||||
<randomMentalState>RandomRape</randomMentalState>
|
||||
<randomMentalStateMtbDaysMoodCurve>
|
||||
<points>
|
||||
<li>(0, 15)</li>
|
||||
<li>(50, 50)</li>
|
||||
<li>(100, 100)</li>
|
||||
</points>
|
||||
</randomMentalStateMtbDaysMoodCurve>
|
||||
</li>
|
||||
</degreeDatas>
|
||||
<requiredWorkTags>
|
||||
<li>Violent</li>
|
||||
</requiredWorkTags>
|
||||
</TraitDef>
|
||||
|
||||
|
||||
</Defs>
|
|
@ -1,105 +0,0 @@
|
|||
<?xml version="1.0" encoding="utf-8" ?>
|
||||
<Patch>
|
||||
|
||||
<Operation Class="PatchOperationAdd">
|
||||
<xpath>Defs/ThoughtDef[defName="KnowGuestExecuted"]/nullifyingTraits</xpath>
|
||||
<value>
|
||||
<li>rjw_genes_sadist</li>
|
||||
</value>
|
||||
</Operation>
|
||||
<Operation Class="PatchOperationAdd">
|
||||
<xpath>Defs/ThoughtDef[defName="KnowPrisonerDiedInnocent"]/nullifyingTraits</xpath>
|
||||
<value>
|
||||
<li>rjw_genes_sadist</li>
|
||||
</value>
|
||||
</Operation>
|
||||
<Operation Class="PatchOperationAdd">
|
||||
<xpath>Defs/ThoughtDef[defName="KnowColonistDied"]/nullifyingTraits</xpath>
|
||||
<value>
|
||||
<li>rjw_genes_sadist</li>
|
||||
</value>
|
||||
</Operation>
|
||||
|
||||
|
||||
|
||||
|
||||
<Operation Class="PatchOperationAdd">
|
||||
<xpath>Defs/ThoughtDef[defName="HarvestedOrgan_Bloodlust"]/requiredTraits</xpath>
|
||||
<value>
|
||||
<li>rjw_genes_sadist</li>
|
||||
</value>
|
||||
</Operation>
|
||||
<Operation Class="PatchOperationAdd">
|
||||
<xpath>Defs/ThoughtDef[defName="KnowGuestOrganHarvested"]/nullifyingTraits</xpath>
|
||||
<value>
|
||||
<li>rjw_genes_sadist</li>
|
||||
</value>
|
||||
</Operation>
|
||||
<Operation Class="PatchOperationAdd">
|
||||
<xpath>Defs/ThoughtDef[defName="KnowColonistOrganHarvested"]/nullifyingTraits</xpath>
|
||||
<value>
|
||||
<li>rjw_genes_sadist</li>
|
||||
</value>
|
||||
</Operation>
|
||||
<Operation Class="PatchOperationAdd">
|
||||
<xpath>Defs/ThoughtDef[defName="ButcheredHumanlikeCorpse"]/nullifyingTraits</xpath>
|
||||
<value>
|
||||
<li>rjw_genes_sadist</li>
|
||||
</value>
|
||||
</Operation>
|
||||
<Operation Class="PatchOperationAdd">
|
||||
<xpath>Defs/ThoughtDef[defName="KnowButcheredHumanlikeCorpse"]/nullifyingTraits</xpath>
|
||||
<value>
|
||||
<li>rjw_genes_sadist</li>
|
||||
</value>
|
||||
</Operation>
|
||||
<Operation Class="PatchOperationAdd">
|
||||
<xpath>Defs/ThoughtDef[defName="ButcheredHumanlikeCorpseOpinion"]/nullifyingTraits</xpath>
|
||||
<value>
|
||||
<li>rjw_genes_sadist</li>
|
||||
</value>
|
||||
</Operation>
|
||||
<Operation Class="PatchOperationAdd">
|
||||
<xpath>Defs/ThoughtDef[defName="ObservedLayingCorpse"]/nullifyingTraits</xpath>
|
||||
<value>
|
||||
<li>rjw_genes_sadist</li>
|
||||
</value>
|
||||
</Operation>
|
||||
<Operation Class="PatchOperationAdd">
|
||||
<xpath>Defs/ThoughtDef[defName="ObservedLayingRottingCorpse"]/nullifyingTraits</xpath>
|
||||
<value>
|
||||
<li>rjw_genes_sadist</li>
|
||||
</value>
|
||||
</Operation>
|
||||
<Operation Class="PatchOperationAdd">
|
||||
<xpath>Defs/ThoughtDef[defName="WitnessedDeathNonAlly"]/nullifyingTraits</xpath>
|
||||
<value>
|
||||
<li>rjw_genes_sadist</li>
|
||||
</value>
|
||||
</Operation>
|
||||
<Operation Class="PatchOperationAdd">
|
||||
<xpath>Defs/ThoughtDef[defName="KilledHumanlikeBloodlust"]/requiredTraits</xpath>
|
||||
<value>
|
||||
<li>rjw_genes_sadist</li>
|
||||
</value>
|
||||
</Operation>
|
||||
<Operation Class="PatchOperationAdd">
|
||||
<xpath>Defs/ThoughtDef[defName="DeadMansApparel"]/nullifyingTraits</xpath>
|
||||
<value>
|
||||
<li>rjw_genes_sadist</li>
|
||||
</value>
|
||||
</Operation>
|
||||
<Operation Class="PatchOperationAdd">
|
||||
<xpath>Defs/ThoughtDef[defName="HumanLeatherApparelSad"]/nullifyingTraits</xpath>
|
||||
<value>
|
||||
<li>rjw_genes_sadist</li>
|
||||
</value>
|
||||
</Operation>
|
||||
<Operation Class="PatchOperationAdd">
|
||||
<xpath>Defs/ThoughtDef[defName="HumanLeatherApparelHappy"]/requiredTraits</xpath>
|
||||
<value>
|
||||
<li>rjw_genes_sadist</li>
|
||||
</value>
|
||||
</Operation>
|
||||
|
||||
</Patch>
|
|
@ -18,7 +18,7 @@ namespace RJW_Genes
|
|||
public static readonly ThoughtDef stoleSomeLovin = DefDatabase<ThoughtDef>.GetNamed("StoleSomeLovin");
|
||||
public static readonly ThoughtDef bloodlustStoleSomeLovin = DefDatabase<ThoughtDef>.GetNamed("BloodlustStoleSomeLovin");
|
||||
public static readonly TraitDef rapist = DefDatabase<TraitDef>.GetNamed("Rapist");
|
||||
public static readonly TraitDef sadist = DefDatabase<TraitDef>.GetNamed("rjw_genes_sadist");
|
||||
|
||||
static Dictionary<string, LaborState> laborStateMap = new Dictionary<string, LaborState>();
|
||||
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;
|
||||
}
|
||||
|
|
|
@ -27,7 +27,24 @@
|
|||
<None Include="..\Common\Defs\Genes\GeneDefs_ExtraGenitaliaEndogenes.xml" />
|
||||
<None Include="..\Common\Defs\Genes\GeneDefs_GenitaliaTypeEndogenes.xml" />
|
||||
<None Include="..\Common\Languages\English\Keyed\Dialog_StatsReport.xml" />
|
||||
<None Include="..\Common\Patches\**" />
|
||||
<None Include="..\Common\Patches\Genes\Patch_Highmates.xml" />
|
||||
<None Include="..\Common\Patches\Genes\Patch_Unbreakable.xml" />
|
||||
<None Include="..\Common\Patches\Xenotypes\GenitaliaUpdate.xml" />
|
||||
<None Include="..\Common\Patches\Xenotypes\PatchAlphaGenes.xml" />
|
||||
<None Include="..\Common\Patches\Xenotypes\PatchBiotechNyaron.xml" />
|
||||
<None Include="..\Common\Patches\Xenotypes\PatchErinsAuronya.xml" />
|
||||
<None Include="..\Common\Patches\Xenotypes\PatchErinsShisune.xml" />
|
||||
<None Include="..\Common\Patches\Xenotypes\PatchKijinRace3.xml" />
|
||||
<None Include="..\Common\Patches\Xenotypes\PatchNarai.xml" />
|
||||
<None Include="..\Common\Patches\Xenotypes\PatchNyaron.xml" />
|
||||
<None Include="..\Common\Patches\Xenotypes\PatchPapou.xml" />
|
||||
<None Include="..\Common\Patches\Xenotypes\PatchRoosFaun.xml" />
|
||||
<None Include="..\Common\Patches\Xenotypes\PatchRoosMinotaur.xml" />
|
||||
<None Include="..\Common\Patches\Xenotypes\PatchRoosSatyr.xml" />
|
||||
<None Include="..\Common\Patches\Xenotypes\PatchSaurid.xml" />
|
||||
<None Include="..\Common\Patches\Xenotypes\PatchVREPhytokin.xml" />
|
||||
<None Include="..\Common\Patches\Xenotypes\PatchVRESanguophage.xml" />
|
||||
<None Include="..\Common\Patches\Xenotypes\PatchXenotech.xml" />
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<Compile Include="Animal_Inheritance\InheritanceUtility.cs" />
|
||||
|
|
Loading…
Reference in a new issue