From c18776540046220122ca0f2d7f23a7efea907cc5 Mon Sep 17 00:00:00 2001
From: Vegapnk <vegapnk@protonmail.com>
Date: Tue, 21 Feb 2023 09:26:01 +0100
Subject: [PATCH] Fixed Path of Used-Condom Ingestion, Added SexSkill Aptitude
 to Succubi and Incubi when present, CAI5000 is incompatible mod

---
 Common/Patches/ThingDefs/RJW_Used_Condoms.xml | 12 ++++----
 .../Patch_Sexperience_SexSkill.xml            | 30 +++++++++++++++++++
 KNOWN_BUGS.md                                 |  2 ++
 README.md                                     |  3 +-
 4 files changed, 41 insertions(+), 6 deletions(-)
 create mode 100644 Common/Patches/Xenotypes/FromRJWGenes/Patch_Sexperience_SexSkill.xml

diff --git a/Common/Patches/ThingDefs/RJW_Used_Condoms.xml b/Common/Patches/ThingDefs/RJW_Used_Condoms.xml
index 9cc2589..d04bcb1 100644
--- a/Common/Patches/ThingDefs/RJW_Used_Condoms.xml
+++ b/Common/Patches/ThingDefs/RJW_Used_Condoms.xml
@@ -3,14 +3,16 @@
 	<!-- Add RJW Sex meditation focus icon to VanillaPsycastsExpanded -->
 	<Operation Class="PatchOperationFindMod">
 		<mods>
-			<li>RJW Sexperience</li>
+			<li>RimJobWorld</li>
 		</mods>
 		<match Class="PatchOperationAdd">
-			<xpath>/Defs/ThingDef[defName="UsedCondom"]/ingestible/outcomeDoers</xpath>
+			<xpath>/Defs/ThingDef[defName="UsedCondom"]/ingestible</xpath>
 			<value>
-				<li Class="RJW_Genes.IngestionOutcomeDoer_LifeForceOffset">
-					<FertilinPerUnit>1</FertilinPerUnit>
-				</li>
+				<outcomeDoers>
+					<li Class="RJW_Genes.IngestionOutcomeDoer_LifeForceOffset">
+						<FertilinPerUnit>1</FertilinPerUnit>
+					</li>
+				</outcomeDoers>
 			</value>
 		</match>
 	</Operation>
diff --git a/Common/Patches/Xenotypes/FromRJWGenes/Patch_Sexperience_SexSkill.xml b/Common/Patches/Xenotypes/FromRJWGenes/Patch_Sexperience_SexSkill.xml
new file mode 100644
index 0000000..419eeb2
--- /dev/null
+++ b/Common/Patches/Xenotypes/FromRJWGenes/Patch_Sexperience_SexSkill.xml
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<Patch>
+<Operation Class="PatchOperationSequence">
+    <operations>
+        <li Class="PatchOperationFindMod">
+            <mods>
+                <li>RJW Sexperience</li>
+            </mods>
+            <match Class="PatchOperationAdd">
+                <xpath>Defs/XenotypeDef[defName="rjw_genes_succubus"]/genes</xpath>
+                <value>
+                    <li>AptitudeRemarkable_Sex</li>
+                </value>
+            </match>
+        </li>
+        <li Class="PatchOperationFindMod">
+            <mods>
+                <li>RJW Sexperience</li>
+            </mods>
+            <match Class="PatchOperationAdd">
+                <xpath>Defs/XenotypeDef[defName="rjw_genes_incubus"]/genes</xpath>
+                <value>
+                    <li>AptitudeRemarkable_Sex</li>
+                </value>
+            </match>
+        </li>
+
+    </operations>
+</Operation>
+</Patch>
\ No newline at end of file
diff --git a/KNOWN_BUGS.md b/KNOWN_BUGS.md
index 2aade1f..ebedd72 100644
--- a/KNOWN_BUGS.md
+++ b/KNOWN_BUGS.md
@@ -23,6 +23,8 @@ Things to Consider:
 
 1. Is your Succubus drafted? If not, they might have a flight-mode set and are scared of the enemy. 
 
+It seems that things changing Enemy Combat AI also affect this. One report was about CAI5000 and we also expect Combat Extended to be incompatible. 
+
 ## Random Vaginas for Goblins 
 
 Error: Pawns have different genitalia than expected, e.g. if the "no vagina" gene is specified there are pawns with vaginas AND a penis. 
diff --git a/README.md b/README.md
index 0f6615e..d138b8a 100644
--- a/README.md
+++ b/README.md
@@ -32,4 +32,5 @@ One of the main motivations was to have genes being added to the xenotypes that
 
 1. Please load this after any mod adding genes, and after the used RJW-Mods (Licentia, Sexperience). 
 2. Should not be used with the original RJW_Animal_Gene_Inheritance anymore. 
-3. There was an issue with other "Male-Only / Female-Only" Mods --- for which we provide our own Genes now. 
\ No newline at end of file
+3. There was an issue with other "Male-Only / Female-Only" Mods --- for which we provide our own Genes now. 
+4. CAI5000 will not crash, but will make *Seduce*-Ability fail.
\ No newline at end of file