From 41cb46118b9f96ec3a8b201100b74cc56ae64fc3 Mon Sep 17 00:00:00 2001
From: Vegapnk <vegapnk@protonmail.com>
Date: Sun, 11 Jun 2023 10:20:08 +0200
Subject: [PATCH] Moved some Conditional Genes to the Xenotypes from Patches,
 also fix #47

---
 Common/Defs/GeneDefs/Xenotype_Hive.xml        |  2 +-
 Common/Defs/GeneDefs/Xenotype_Lifeforce.xml   |  7 ++++
 .../FromRJWGenes/PatchLicentiaLabs.xml        | 14 -------
 .../FromRJWGenes/Patch_Dominant_Gene.xml      | 41 -------------------
 .../Patch_Sexperience_SexSkill.xml            | 30 --------------
 5 files changed, 8 insertions(+), 86 deletions(-)
 delete mode 100644 Common/Patches/Xenotypes/FromRJWGenes/PatchLicentiaLabs.xml
 delete mode 100644 Common/Patches/Xenotypes/FromRJWGenes/Patch_Dominant_Gene.xml
 delete mode 100644 Common/Patches/Xenotypes/FromRJWGenes/Patch_Sexperience_SexSkill.xml

diff --git a/Common/Defs/GeneDefs/Xenotype_Hive.xml b/Common/Defs/GeneDefs/Xenotype_Hive.xml
index 7d8b31b..bca30ab 100644
--- a/Common/Defs/GeneDefs/Xenotype_Hive.xml
+++ b/Common/Defs/GeneDefs/Xenotype_Hive.xml
@@ -36,7 +36,7 @@
         <li>AptitudeTerrible_Shooting</li>
         <li>AptitudeTerrible_Melee</li>
         <li>AptitudeRemarkable_Social</li>
-        <li>AptitudeRemarkable_Sex</li>
+        <li MayRequire="rjw.sexperience">AptitudeRemarkable_Sex</li>
         <li>rjw_genes_female_only</li>
         <li>rjw_genes_ovipositor_genitalia</li>
         <li>rjw_genes_aphrodisiac_pheromones</li>
diff --git a/Common/Defs/GeneDefs/Xenotype_Lifeforce.xml b/Common/Defs/GeneDefs/Xenotype_Lifeforce.xml
index 646d4c8..608a2f4 100644
--- a/Common/Defs/GeneDefs/Xenotype_Lifeforce.xml
+++ b/Common/Defs/GeneDefs/Xenotype_Lifeforce.xml
@@ -35,7 +35,10 @@
 
         <li>rjw_genes_paralysingkiss</li>
         <li>rjw_genes_seduce</li>
+        <li MayRequire="rjw.sexperience">AptitudeRemarkable_Sex</li>
 		
+        <li MayRequire="Sl4vP0weR.DominantGene">DominantGene</li>
+        <li MayRequire="LustLicentia.RJWLabs">rjw_genes_elasticity</li>
 		    <li>rjw_genes_succubus_wings</li>
         <li>rjw_genes_succubus_tail</li>
         <li>rjw_genes_aphrodisiac_pheromones</li>
@@ -77,6 +80,10 @@
 		    <li>rjw_genes_drainer</li>
 		    <li>rjw_genes_demonic_genitalia</li>
 	
+        <li MayRequire="rjw.sexperience">AptitudeRemarkable_Sex</li>
+        
+	
+        <li MayRequire="Sl4vP0weR.DominantGene">DominantGene</li>
         <li>rjw_genes_seduce</li>
 		    <li>rjw_genes_succubus_wings</li>
         <li>rjw_genes_succubus_tail</li>
diff --git a/Common/Patches/Xenotypes/FromRJWGenes/PatchLicentiaLabs.xml b/Common/Patches/Xenotypes/FromRJWGenes/PatchLicentiaLabs.xml
deleted file mode 100644
index 5c85681..0000000
--- a/Common/Patches/Xenotypes/FromRJWGenes/PatchLicentiaLabs.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<Patch>
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>LustLicentia.RJWLabs</li>
-		</mods>
-		<match Class="PatchOperationAdd">
-			<xpath>Defs/XenotypeDef[defName="rjw_genes_succubus"]/genes</xpath>
-			<value>
-				<li>rjw_genes_elasticity</li>
-			</value>
-		</match>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Common/Patches/Xenotypes/FromRJWGenes/Patch_Dominant_Gene.xml b/Common/Patches/Xenotypes/FromRJWGenes/Patch_Dominant_Gene.xml
deleted file mode 100644
index 15b6f3f..0000000
--- a/Common/Patches/Xenotypes/FromRJWGenes/Patch_Dominant_Gene.xml
+++ /dev/null
@@ -1,41 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<Patch>
-<Operation Class="PatchOperationSequence">
-    <operations>
-        <li Class="PatchOperationFindMod">
-            <mods>
-                <li>Dominant Gene</li>
-            </mods>
-            <match Class="PatchOperationAdd">
-                <xpath>Defs/XenotypeDef[defName="rjw_genes_succubus"]/genes</xpath>
-                <value>
-                    <li>DominantGene</li>
-                </value>
-            </match>
-        </li>
-        <li Class="PatchOperationFindMod">
-            <mods>
-                <li>Dominant Gene</li>
-            </mods>
-            <match Class="PatchOperationAdd">
-                <xpath>Defs/XenotypeDef[defName="rjw_genes_incubus"]/genes</xpath>
-                <value>
-                    <li>DominantGene</li>
-                </value>
-            </match>
-        </li>
-
-        <li Class="PatchOperationFindMod">
-            <mods>
-                <li>Dominant Gene</li>
-            </mods>
-            <match Class="PatchOperationAdd">
-                <xpath>Defs/XenotypeDef[defName="rjw_genes_cumazone"]/genes</xpath>
-                <value>
-                    <li>DominantGene</li>
-                </value>
-            </match>
-        </li>
-    </operations>
-</Operation>
-</Patch>
\ No newline at end of file
diff --git a/Common/Patches/Xenotypes/FromRJWGenes/Patch_Sexperience_SexSkill.xml b/Common/Patches/Xenotypes/FromRJWGenes/Patch_Sexperience_SexSkill.xml
deleted file mode 100644
index 419eeb2..0000000
--- a/Common/Patches/Xenotypes/FromRJWGenes/Patch_Sexperience_SexSkill.xml
+++ /dev/null
@@ -1,30 +0,0 @@
-<?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