Nested 2 Mod-Search for AG_Malachai, Fixes #68

CHANGELOG.md

@@ -1,3 +1,10 @@
+# 1.3.3
+
+**Fixes:** 
+
+- Added another check to the AG Malachai Xenotype (Fixes #68)
+- Fixed the `GatheredCum`Fertilin Ingestion Patch throwing an Error for people without Sexperience (Fixes #69 (nice))
+
 # 1.3.2
 
 **Fixes:**

Common/Patches/ThingDefs/Sexperience_Cum.xml

@@ -1,9 +1,10 @@
-<?xml version="1.0" encoding="utf-8" ?>
+<?xml version="1.0" encoding="utf-8"?>
 <Patch>
 
 	<!-- 
 		DevNote:
-		There used to be an issue with a Gene-Mod Called "Cum-Addiction Gene". That mod just overwrote the complete UsedCondom.xml and Sexperience Cum.xml
+		There used to be an issue with a Gene-Mod Called "Cum-Addiction Gene". That mod just overwrote the
+	complete UsedCondom.xml and Sexperience Cum.xml
 		This would lead to two types of failures: 
 		A) If this mod was before the other mod, changes were just overwritten
 		B) If this mod was after, there was an issue in targetting the XML throwing a patch error
@@ -11,26 +12,30 @@
 
 		This patch was kindly mirrored after Infis Patch of UsedCondoms. 
 	-->
-
-	<Operation Class="PatchOperationConditional">
-		<xpath>Defs/ThingDef[defName="GatheredCum"]/ingestible/outcomeDoers</xpath>
-		<nomatch Class="PatchOperationAdd">
-			<xpath>/Defs/ThingDef[defName="GatheredCum"]/ingestible</xpath>
-			<value>
-				<outcomeDoers>
+	<Operation Class="PatchOperationFindMod">
+		<mods>
+			<li>RJW Sexperience</li>
+		</mods>
+		<match Class="PatchOperationConditional">
+			<xpath>Defs/ThingDef[defName="GatheredCum"]/ingestible/outcomeDoers</xpath>
+			<nomatch Class="PatchOperationAdd">
+				<xpath>/Defs/ThingDef[defName="GatheredCum"]/ingestible</xpath>
+				<value>
+					<outcomeDoers>
+						<li Class="RJW_Genes.IngestionOutcomeDoer_LifeForceOffset">
+							<FertilinPerUnit>1</FertilinPerUnit>
+						</li>
+					</outcomeDoers>
+				</value>
+			</nomatch>
+			<match Class="PatchOperationAdd">
+				<xpath>Defs/ThingDef[defName="GatheredCum"]/ingestible/outcomeDoers</xpath>
+				<value>
 					<li Class="RJW_Genes.IngestionOutcomeDoer_LifeForceOffset">
 						<FertilinPerUnit>1</FertilinPerUnit>
 					</li>
-				</outcomeDoers>
-			</value>
-		</nomatch>
-		<match Class="PatchOperationAdd">
-			<xpath>Defs/ThingDef[defName="GatheredCum"]/ingestible/outcomeDoers</xpath>
-			<value>
-				<li Class="RJW_Genes.IngestionOutcomeDoer_LifeForceOffset">
-						<FertilinPerUnit>1</FertilinPerUnit>
-					</li>
-			</value>
+				</value>
+			</match>
 		</match>
 	</Operation>
 

Common/Patches/Xenotypes/PatchAlphaGenes.xml

@@ -109,6 +109,23 @@
                 </match>
             </li>
 
+            <li Class="PatchOperationFindMod">
+                <mods>
+                    <li>Alpha Genes</li>
+                </mods>
+                <match Class="PatchOperationFindMod">
+                    <mods>
+                        <li>Vanilla Races Expanded - Sanguophage</li>
+                    </mods>
+                    <match Class="PatchOperationAdd">
+                        <xpath>Defs/XenotypeDef[defName="AG_Malachai"]/genes</xpath>
+                        <value>
+                            <li>rjw_genes_demonic_genitalia</li>
+                        </value>
+                    </match>
+                </match>
+            </li>
+
         </operations>
     </Operation>
 </Patch>