Merge branch 'dev' into dev

This commit is contained in:
Shabakur 2023-01-08 14:12:58 +01:00 committed by GitHub
commit 6f2c4dc374
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
19 changed files with 444 additions and 77 deletions

View file

@ -0,0 +1,68 @@
<?xml version="1.0" encoding="utf-8" ?>
<Patch>
<Operation Class="PatchOperationAdd">
<xpath>Defs/ThoughtDef[defName="FeelingBroken"]</xpath>
<value>
<nullifyingGenes>
<li>rjw_genes_unbreakable</li>
</nullifyingGenes>
</value>
</Operation>
<Operation Class="PatchOperationAdd">
<xpath>Defs/ThoughtDef[defName="GotRaped"]</xpath>
<value>
<nullifyingGenes>
<li>rjw_genes_unbreakable</li>
</nullifyingGenes>
</value>
</Operation>
<Operation Class="PatchOperationAdd">
<xpath>Defs/ThoughtDef[defName="GotAnalRaped"]</xpath>
<value>
<nullifyingGenes>
<li>rjw_genes_unbreakable</li>
</nullifyingGenes>
</value>
</Operation>
<Operation Class="PatchOperationAdd">
<xpath>Defs/ThoughtDef[defName="GotAnalRapedByFemale"]</xpath>
<value>
<nullifyingGenes>
<li>rjw_genes_unbreakable</li>
</nullifyingGenes>
</value>
</Operation>
<Operation Class="PatchOperationAdd">
<xpath>Defs/ThoughtDef[defName="GotRapedUnconscious"]</xpath>
<value>
<nullifyingGenes>
<li>rjw_genes_unbreakable</li>
</nullifyingGenes>
</value>
</Operation>
<Operation Class="PatchOperationAdd">
<xpath>Defs/ThoughtDef[defName="HateMyRapist"]</xpath>
<value>
<nullifyingGenes>
<li>rjw_genes_unbreakable</li>
</nullifyingGenes>
</value>
</Operation>
<Operation Class="PatchOperationAdd">
<xpath>Defs/ThoughtDef[defName="AllowedMeToGetRaped"]</xpath>
<value>
<nullifyingGenes>
<li>rjw_genes_unbreakable</li>
</nullifyingGenes>
</value>
</Operation>
</Patch>

View file

@ -1,44 +1,6 @@
<?xml version="1.0" encoding="utf-8" ?>
<Patch>
<!--TODO: The Baseline does not show up with human genitalia? -->
<!--
<Operation Class="PatchOperationAdd">
<xpath>Defs/XenotypeDef[defName="Baseline"]</xpath>
<value>
<genes>
<li>rjw_genes_human_genitalia</li>
<li>rjw_genes_normal_anus</li>
<li>rjw_genes_normal_breasts</li>
<li>rjw_genes_normal_male_genitalia</li>
<li>rjw_genes_normal_female_genitalia</li>
</genes>
</value>
</Operation>
<Operation Class="PatchOperationAdd">
<xpath>Defs/XenotypeDef[defName="Dirtmole"]/genes</xpath>
<value>
<li>rjw_genes_human_genitalia</li>
<li>rjw_genes_normal_anus</li>
<li>rjw_genes_normal_breasts</li>
<li>rjw_genes_normal_male_genitalia</li>
<li>rjw_genes_normal_female_genitalia</li>
</value>
</Operation>
<Operation Class="PatchOperationAdd">
<xpath>Defs/XenotypeDef[defName="Hussar"]/genes</xpath>
<value>
<li>rjw_genes_human_genitalia</li>
<li>rjw_genes_normal_anus</li>
<li>rjw_genes_normal_breasts</li>
<li>rjw_genes_normal_male_genitalia</li>
<li>rjw_genes_normal_female_genitalia</li>
</value>
</Operation>
-->
<Operation Class="PatchOperationAdd">
<xpath>Defs/XenotypeDef[defName="Neanderthal"]/genes</xpath>
<value>
@ -77,16 +39,18 @@
</value>
</Operation>
<!-- Conditional Patch, only add these Genes for players with Licentia
I tried "mayRequire" but that cannot be put so fine-grained into the <li> -->
<Operation Class="PatchOperationFindMod">
<mods>
<li>RimJobWorld - Licentia Labs</li>
</mods>
<match Class="PatchOperationAdd">
<xpath>Defs/XenotypeDef[defName="Highmate"]/genes</xpath>
<value>
<li>rjw_genes_likes_cumflation</li>
</value>
</match>
<mods>
<li>LustLicentia.RJWLabs</li>
</mods>
<match Class="PatchOperationAddModExtension">
<xpath>Defs/XenotypeDef[defName="Highmate"]/genes</xpath>
<value>
<li>rjw_genes_likes_cumflation</li>
</value>
</match>
</Operation>
<Operation Class="PatchOperationAdd">