Merge pull request #82 from vegapnk/dev

2.0.0 Release
Added 2.0.0 Binary
2024-05-30 16:06:03 +02:00 · 2024-05-30 15:59:47 +02:00 · 2024-05-30 15:57:07 +02:00 · 2024-05-30 15:43:37 +02:00 · 2024-05-30 15:18:44 +02:00 · 2024-05-30 11:36:34 +02:00
326 changed files with 4426 additions and 3288 deletions
--- a/.gitignore
+++ b/.gitignore
@ -1,7 +1,8 @@
+*.user
+
 ## Ignore Visual Studio temporary files, build results, and
 ## files generated by popular Visual Studio add-ons.

-
 # User-specific files (MonoDevelop/Xamarin Studio)
 *.userprefs

--- a/About/About.xml
+++ b/About/About.xml
@ -3,7 +3,7 @@
 	<author>Vegapnk</author>
    <packageId>Vegapnk.rjw.genes</packageId>
 	<supportedVersions>
-		<li>1.4</li>
+		<li>1.5</li>
 	</supportedVersions>
 	<description>Adds Genes for RJW Content</description>
 	<url>https://steamcommunity.com/id/Vegapnk/myworkshopfiles/?appid=294100</url>
--- a/About/Manifest.xml
+++ b/About/Manifest.xml
@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
 <Manifest>
 	<identifier>RJW-Genes</identifier>
-	<version>1.2.0</version>
+	<version>2.0.0</version>
 	<dependencies>
        <li>RimJobWorld</li>
 		<li>HugsLib</li>
--- a/About/Preview.png
+++ b/About/Preview.png
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@ -1,3 +1,109 @@
+# 2.0.0
+
+**Summary**:
+
+- 1.5 Support 
+- Femboys, MPReg
+- Couple Implants around Fertility / Sex / Pregnancy
+- Hive Removal (to be reintroduced somewhere else)
+- Licentia Genes became placeholders, no functions until Licentia is on 1.5
+
+**Additions**: 
+
+- initial Rimworld 1.5 thanks to @jaaldabaoth
+- Fertile Anus Gene, thanks to @jaaldabaoth
+- Femboy Genes, for male pawns with Vaginas @jaaldabaoth
+- Udder Gene @jaaldabaoth , Fixes #57
+- Some other Genitalia Sets (Crocodilian, Racoon, ...) thanks to @jaaldabaoth, Closes #57
+- LitteredBirthsGene thanks to @jaaldabaoth
+- OvaryAgitator that allows for a cyclic fertility. Thanks @jaaldabaoth. See [its description](./Common/Defs/ThingDefs/OvaryAgitator.xml)
+- LimbicStimulator / Scrambler thanks to @jaaldabaoth. See [Scrambler Description](Common/Defs/ThingDefs/Scrambler.xml) and [Limbic Stimulator](./Common/Defs/ThingDefs/LimbicStimulator.xml)
+- Bioscaffold that allows for faster pregnancies. thanks to @jaaldabaoth. See [its description](./Common/Defs/ThingDefs/Bioscaffold.xml)
+- Multi-Pregnancy Gene thanks to @jaaldabaoth
+- Many genes have settings configurable in their xml - tick speeds and distances.
+
+**Changes**: 
+
+- Modularised many "change gentialia sets"-genes into a XML configurations. Thanks to @flock-of-birds
+- **Removed** Hive Logic for now! This might break some of your save-games. 
+- Highmates "Initiate Loving" uses Succubus "Seduce" ability, thanks to @jaaldabaoth
+- Slider for Evergrowth Tick-Speed, thanks to @jaaldabaoth
+- Resizing Age for resizing Genes can be set in Settings @jaaldabaoth
+- **Licentia related genes are only placeholders**, as Licentia is not 1.5 yet
+- InsectIncubator only does self-fertilization now, but does not increase storage capacities for eggs anymore
+- Some Genes (GenitaliaTypes, Cum, some others) cannot be in quest-rewards anymore. Special, Size, Breeding and Lifeforce genes still can be quest rewards.
+
+**Fixes:** 
+
+- Small changes to drawing Succubus Wings
+- Minor Format changes to lots of XML files
+- Pawns with ONLY an Archotech penis will not give Fertilin, and will not receive debuffs (Fixes #71)
+
+**Hidden Changes:** 
+
+- Patches for "Same Mother" / "Same Father" to account for Male-Pregs. This should only extend behaviour but be warned a bit. 
+- Patches to RJW-Pregnancy Helper to account for Male Pregs. 
+- Some replacements from `hasGene` to `hasActiveGene` 
+
+# 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:**
+
+- Removed patch for Malachai, needs a different patching operator but I don't want to have broken fixes for now (Tracked in a new Issue)
+
+# 1.3.1 
+
+**Changes**
+
+- Added patches for Alpha-Genes Animusen, Drakonori and Malachai (Closes #65, thanks @Stars22223)
+- Little Social Boost for Pawns affected by pheromones (Closes #50)
+
+**Fixes:**
+
+- XML Missmatch for Succubus Letter (Fixed in #64, thanks @mwcrow)
+- Made constructor for Empathetic Lifeforce explicitly `public` to not hang up in character creation (Fixes #66)
+
+# 1.3.0 (19-09-2023)
+
+**Changes:**
+
+- New Gene for Evergrowing Cocks. Be careful. 
+- New Gene for Genderfluid Pawns - daily chance to change sex. Futas just change "display" and keep genitalia, other pawns switch genitalia. XML configurable times & chances. 
+- New Drawings for the Succubi Wings & Tail, thanks to @Monti (donated via Discord)
+- Simple Gene that removes Sex need (called asexual, `rjw_genes_no_sex_need`)
+- New Gene that grows Penisses on Oral sex. Configurable in XML. 
+- New Gene Lifeforce Empath: Gain Lifeforce for sexually satisfied pawns, loose for frustrated pawns.
+- More genes are configurable with XML, e.g. tick speed, distances or multipliers. I am getting the hang of it. 
+- Halfed Succubus Fertilin-Need, increased cost of abilities.
+- Translation Keys for some letters
+
+**Fixes:**
+
+- New attempt at fixing condom consumption for Fertilin, adressing #41 & #48 provided by Infi
+- Copy of Infis patch for eating cum from sexperience, #41 and #48
+- Updated some Icons to have better backgrounds (thanks @WasmachenDennSachenSo #53)
+- Custom Queen- and Drone-Xenotypes should work now. 
+- Some more checks if Queen is on Map or not (fixing #60)
+
+*Notes*: 
+The pawns that are gender fluid can get pregnant. 
+However, with RJW 5.3.7 these pregnancies disappear. 
+This is a change needed upstream, but I will have a look. 
+
+# 1.2.1 
+
+**Fixes**: 
+
+- Issue with RJW Changes for Orgasms, #52. Methods were renamed. 
+- Notes on the Gene Inheritance #51
+
 # 1.2 (11-06-2023)

 **Changes:**
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@ -17,6 +17,8 @@ But please consider also the following:

 - Shabalox (MechBreeding, InsectBreeding, Animal Gene Inheritance)
 - WasMachenDennSachen (Various Icons)
+- Jaaldabaoth (1.5 Migration, MPreg, Femboys)
+- Flock-of-Birds (Cosmetic Genitalia per XML)

 ## Other Credits 

--- a/Common/Assemblies/Rjw-Genes.dll
+++ b/Common/Assemblies/Rjw-Genes.dll
--- a/Common/Defs/AbilityDefs/Ability_NakedProwess.xml
+++ b/Common/Defs/AbilityDefs/Ability_NakedProwess.xml
@ -38,7 +38,7 @@
      </li>
 	  <li Class="RJW_Genes.CompProperties_CasterIsNaked"/>
 	  <li Class="RJW_Genes.CompProperties_AbilityLifeForceCost">
-        <fertilinCost>0.1</fertilinCost>
+        <fertilinCost>0.15</fertilinCost>
      </li>
    </comps>
 	
--- a/Common/Defs/AbilityDefs/Ability_ParalysingKiss.xml
+++ b/Common/Defs/AbilityDefs/Ability_ParalysingKiss.xml
@ -37,7 +37,7 @@
        <fleckDef>rjw_genes_lips</fleckDef> <!--Will change to kiss when I have a good icon/fleck for it-->
      </li>
 	  <li Class="RJW_Genes.CompProperties_AbilityLifeForceCost">
-        <fertilinCost>0.05</fertilinCost>
+        <fertilinCost>0.1</fertilinCost>
      </li>
    </comps> 
  </AbilityDef>
--- a/Common/Defs/AbilityDefs/Ability_PussyHeal.xml
+++ b/Common/Defs/AbilityDefs/Ability_PussyHeal.xml
@ -28,7 +28,7 @@
    </verbProperties>
    <comps>
 	  <li Class="RJW_Genes.CompProperties_AbilityLifeForceCost">
-        <fertilinCost>0.2</fertilinCost>
+        <fertilinCost>0.3</fertilinCost>
      </li>
      <li Class="RJW_Genes.CompProperties_AbilityPussyHeal"> 
        <tendQualityRange>0.4~0.8</tendQualityRange> 
--- a/Common/Defs/AbilityDefs/Ability_Seduce.xml
+++ b/Common/Defs/AbilityDefs/Ability_Seduce.xml
@ -36,8 +36,9 @@
        <fleckDef>Heart</fleckDef>
      </li>
 	  <li Class="RJW_Genes.CompProperties_AbilityLifeForceCost">
-        <fertilinCost>0.1</fertilinCost>
+        <fertilinCost>0.20</fertilinCost>
      </li>
    </comps>
  </AbilityDef>
+  
 </Defs>
--- a/Common/Defs/AbilityDefs/Ability_SpawnSpelopede.xml
+++ b/Common/Defs/AbilityDefs/Ability_SpawnSpelopede.xml
@ -1,36 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<Defs>
-  <AbilityDef>
-    <defName>rjw_genes_ability_spawn_spelopede</defName>
-    <label>Insect Ally</label>
-    <description>Generates a tame spelopede, ready to serve their master.</description>
-    <iconPath>Genes/Icons/Spelopede_Dispenser</iconPath>
-    <displayGizmoWhileUndrafted>true</displayGizmoWhileUndrafted>
-    <disableGizmoWhileUndrafted>false</disableGizmoWhileUndrafted>
-
-    <verbProperties>
-      <verbClass>Verb_CastAbility</verbClass>
-      <warmupTime>3</warmupTime>
-      <drawAimPie>False</drawAimPie>
-      <requireLineOfSight>False</requireLineOfSight>
-      <range>2</range>
-      <targetParams>
-        <canTargetPawns>False</canTargetPawns>
-        <canTargetLocations>True</canTargetLocations>
-      </targetParams>
-    </verbProperties>
-    
-    <canUseAoeToGetTargets>False</canUseAoeToGetTargets>
-    <cooldownTicksRange>1800000</cooldownTicksRange>
-
-    <comps>
-      <li Class = "RJW_Genes.CompProperties_AbilitySpawnSpelopede">
-        <compClass>RJW_Genes.CompAbilityEffect_SpawnSpelopede</compClass>
-        <pawnKindDef>Spelopede</pawnKindDef>
-        <tamed>true</tamed>
-        <sensitivityMultiplier>1.00</sensitivityMultiplier>
-      </li>
-    </comps>
-  </AbilityDef>
-
-</Defs>
--- a/Common/Defs/GeneDefs/GeneCategories.xml
+++ b/Common/Defs/GeneDefs/GeneCategories.xml
@ -21,7 +21,7 @@

  <GeneCategoryDef>
    <defName>rjw_genes_genitalia_type</defName>
-    <label>Genitalia Types</label>
+    <label>cosmetic - Genitalia Types</label>
    <displayPriorityInXenotype>19</displayPriorityInXenotype>
  </GeneCategoryDef>

@ -67,11 +67,5 @@
    <displayPriorityInXenotype>8</displayPriorityInXenotype>
  </GeneCategoryDef>
  
-  <GeneCategoryDef>
-    <defName>rjw_genes_hive</defName>
-    <label>Hive</label>
-    <displayPriorityInXenotype>7</displayPriorityInXenotype>
-  </GeneCategoryDef>
-  
  
 </Defs>
--- a/Common/Defs/GeneDefs/GeneDefs_Breeding.xml
+++ b/Common/Defs/GeneDefs/GeneDefs_Breeding.xml
@ -2,15 +2,8 @@
 <Defs>
  <!-- rjw_genes_mechbreeder,rjw_genes_insectincubator and rjw_genes_insectbreeder were kindly supplied by `Shabalox` https://github.com/Shabalox/RJW_Genes_Addons/ -->

-  <GeneDef>
-    <defName>rjw_genes_mechbreeder</defName>
-    <label>Mechbreeder</label>
-    <description>Pawns with this gene are able to birth mechanoids unharmed.</description>
-    <iconPath>World/WorldObjects/Expanding/Mechanoids</iconPath>
-    <displayOrderInCategory>51</displayOrderInCategory>
+  <GeneDef Name="BreedingBase" Abstract="True">
 		<displayCategory>rjw_genes_breeding</displayCategory>
-    <biostatCpx>1</biostatCpx>
-    <biostatMet>-1</biostatMet>

 		<modExtensions>
 				<li MayRequire="OskarPotocki.VanillaFactionsExpanded.Core" Class="VanillaGenesExpanded.GeneExtension">
@ -20,10 +13,20 @@
 			</modExtensions>
 	</GeneDef>

-  <GeneDef>
+
+  <GeneDef ParentName="BreedingBase">
+    <defName>rjw_genes_mechbreeder</defName>
+    <label>Mechbreeder</label>
+    <description>Pawns with this gene are able to birth mechanoids unharmed.</description>
+    <iconPath>World/WorldObjects/Expanding/Mechanoids</iconPath>
+    <displayOrderInCategory>51</displayOrderInCategory>
+    <biostatCpx>1</biostatCpx>
+    <biostatMet>-1</biostatMet>
+  </GeneDef>
+  
+  <GeneDef ParentName="BreedingBase">
      <defName>rjw_genes_zoophile</defName>
      <label>Zoophile</label>
-      <displayCategory>rjw_genes_breeding</displayCategory>
      <description>Xenotypes with this Gene are Zoophile.</description>
      <iconPath>Genes/Icons/Zoophile</iconPath>
      <displayOrderInCategory>54</displayOrderInCategory>    
@ -32,13 +35,46 @@
              <def>Zoophile</def>
          </li>
      </forcedTraits>
+  </GeneDef>
  
-    <modExtensions>
-			<li MayRequire="OskarPotocki.VanillaFactionsExpanded.Core" Class="VanillaGenesExpanded.GeneExtension">
-				<backgroundPathEndogenes>Genes/Icons/RJW_Genes_Endogene_Background</backgroundPathEndogenes>
-				<backgroundPathXenogenes>Genes/Icons/RJW_Genes_Xenogene_Background</backgroundPathXenogenes>
-			</li>
-		</modExtensions>
+  <GeneDef ParentName="BreedingBase">
+      <defName>rjw_genes_fertile_anus</defName>
+      <label>Fertile Anus</label>
+      <description>Xenotypes with this gene have a functional uterus connected to the anal cavity even for males</description>
+      <iconPath>Genes/Icons/Fertile_anus</iconPath>
+      <displayOrderInCategory>54</displayOrderInCategory>    
+  </GeneDef>
+
+  <GeneDef ParentName="BreedingBase">
+    <defName>rjw_genes_insectincubator</defName>
+    <label>Insect Incubator</label>	
+	  <geneClass>RJW_Genes.Gene_InsectIncubator</geneClass>
+    <description>Pawns with this gene fertilize insect eggs that are placed inside them.</description>
+    <iconPath>Genes/Icons/Egg</iconPath>
+    <displayOrderInCategory>52</displayOrderInCategory>
+    <biostatCpx>1</biostatCpx>
+    <biostatMet>-1</biostatMet>
+  </GeneDef>
+
+  <GeneDef ParentName="BreedingBase">
+    <defName>rjw_genes_insectbreeder</defName>
+    <label>Insect Breeder</label>	
+    <description>Pawns with this gene are able to fertilize eggs with any fertile penis.</description>
+    <iconPath>Genes/Icons/Insect_Breeder</iconPath>
+    <displayOrderInCategory>53</displayOrderInCategory>
+    <biostatCpx>1</biostatCpx>
+    <biostatMet>-1</biostatMet>
+  </GeneDef>
+
+  <GeneDef ParentName="BreedingBase">
+    <defName>rjw_genes_fervent_ovipositor</defName>
+    <label>Fervent Ovipositor</label>	
+	  <geneClass>RJW_Genes.Gene_FerventOvipositor</geneClass>
+    <description>Pawns that have a female (egg producing) ovipositor produce eggs at drastically increased speed.</description>
+    <iconPath>Genes/Icons/Fervent_Ovipositor</iconPath>
+    <displayOrderInCategory>55</displayOrderInCategory>
+    <biostatCpx>1</biostatCpx>
+    <biostatMet>-1</biostatMet>
  </GeneDef>

 </Defs>
--- a/Common/Defs/GeneDefs/GeneDefs_Cosmetic.xml
+++ b/Common/Defs/GeneDefs/GeneDefs_Cosmetic.xml
@ -6,9 +6,6 @@
    <exclusionTags>
      <li>Wing</li>
    </exclusionTags>
-    <graphicData>
-      <drawLoc>Tailbone</drawLoc>
-    </graphicData>
  </GeneDef>

  <GeneDef ParentName="rjw_genes_wings">
@ -26,14 +23,25 @@
 	</descriptionHyperlinks>
    <biostatCpx>1</biostatCpx>
 	<biostatMet>-1</biostatMet>
-    <graphicData>
-      <graphicPath>Things/Pawn/Humanlike/BodyAttachments/rjw_genes_Succubus_Wings/Succubus_Wings</graphicPath>
+	<selectionWeight>0</selectionWeight>
+	<renderNodeProperties>
+		<li>
+			<workerClass>PawnRenderNodeWorker_AttachmentBody</workerClass>
+			<texPath>Things/Pawn/Humanlike/BodyAttachments/RJW_Genes_Succubus_Wings</texPath>
+			<drawSize>1.5</drawSize>
+			<parentTagDef>Body</parentTagDef>
 			<colorType>Skin</colorType>
-	  <drawScale>2</drawScale>
-      <drawOffsetNorth>(0.0, 0.01, -0.1)</drawOffsetNorth>
-      <drawOffsetSouth>(0.0, 0.0, -0.1)</drawOffsetSouth>
-      <drawOffsetEast>(0.1, 0.0, 0.0)</drawOffsetEast>
-    </graphicData>
+			<drawData>
+			<defaultData>
+				<layer>-2</layer>
+			</defaultData>
+			<scaleOffsetByBodySize>true</scaleOffsetByBodySize>
+			<dataNorth>
+			<layer>90</layer>
+			</dataNorth>
+			</drawData>
+		</li>
+	</renderNodeProperties>
    
    <modExtensions>
 			<li MayRequire="OskarPotocki.VanillaFactionsExpanded.Core" Class="VanillaGenesExpanded.GeneExtension">
@ -58,19 +66,36 @@
    </capMods>
    <biostatCpx>1</biostatCpx>
    <biostatMet>-1</biostatMet>
-    <graphicData>
-      <graphicPaths>
-		<li>Things/Pawn/Humanlike/BodyAttachments/rjw_genes_Succubus_Tail/Succubus_Tail_L1</li>
-		<li>Things/Pawn/Humanlike/BodyAttachments/rjw_genes_Succubus_Tail/Succubus_Tail_R1</li>
-		<li>Things/Pawn/Humanlike/BodyAttachments/rjw_genes_Succubus_Tail/Succubus_Tail_L2</li>
-		<li>Things/Pawn/Humanlike/BodyAttachments/rjw_genes_Succubus_Tail/Succubus_Tail_R2</li>
-	  </graphicPaths>
+    <selectionWeight>0</selectionWeight>
+		<renderNodeProperties>
+			<li>
+				<workerClass>PawnRenderNodeWorker_AttachmentBody</workerClass>
+				<texPath>Things/Pawn/Humanlike/BodyAttachments/RJW_Genes_Succubus_Tail</texPath>
+				<overrideMeshSize>(1.5, 1.5)</overrideMeshSize>
+				<parentTagDef>Body</parentTagDef>
 				<colorType>Skin</colorType>
-	  <drawScale>2</drawScale>
-      <drawOffsetNorth>(0, 0.2, -0.1)</drawOffsetNorth>
-      <drawOffsetSouth>(0, -0.1, 0.1)</drawOffsetSouth>
-      <drawOffsetEast>(0.2, 0.2, 0.1)</drawOffsetEast>
-    </graphicData>
+				<rotDrawMode>Fresh, Rotting</rotDrawMode>
+				<drawData>
+					<scaleOffsetByBodySize>true</scaleOffsetByBodySize>
+					<defaultData>
+						<layer>-2</layer>
+					</defaultData>
+					<dataNorth>
+						<offset>(0, 0, -0.15)</offset>
+						<layer>90</layer>
+					</dataNorth>
+					<dataSouth>
+						<offset>(-0, 0, -0.15)</offset>
+					</dataSouth>
+					<dataEast>
+						<offset>(-0.2, 0, -0.15)</offset>
+					</dataEast>
+					<dataWest>
+						<offset>(0.2, 0, -0.15)</offset>
+					</dataWest>
+				</drawData>
+			</li>
+		</renderNodeProperties>
 	  <randomChosen>true</randomChosen>
  
    <modExtensions>
--- a/Common/Defs/GeneDefs/GeneDefs_Cum.xml
+++ b/Common/Defs/GeneDefs/GeneDefs_Cum.xml
@ -5,7 +5,7 @@
      <exclusionTags>
          <li>CumAmount</li>
      </exclusionTags>  
-        
+      <randomChosen>false</randomChosen>
      <modExtensions>
        <li MayRequire="OskarPotocki.VanillaFactionsExpanded.Core" Class="VanillaGenesExpanded.GeneExtension">
          <backgroundPathEndogenes>Genes/Icons/RJW_Genes_Endogene_Background</backgroundPathEndogenes>
--- a/Common/Defs/GeneDefs/GeneDefs_ExtraGenitalia.xml
+++ b/Common/Defs/GeneDefs/GeneDefs_ExtraGenitalia.xml
@ -3,6 +3,7 @@
  <GeneDef Name="GeneExtraGenitaliaBase" Abstract="True">
    <displayCategory>rjw_genes_genitalia_extras</displayCategory>

+	  <randomChosen>false</randomChosen>
    <modExtensions>
 			<li MayRequire="OskarPotocki.VanillaFactionsExpanded.Core" Class="VanillaGenesExpanded.GeneExtension">
 				<backgroundPathEndogenes>Genes/Icons/RJW_Genes_Endogene_Background</backgroundPathEndogenes>
@ -122,6 +123,19 @@
 	    </exclusionTags>
    </GeneDef>
 	
+	<GeneDef ParentName="GeneExtraGenitaliaBase">
+	    <defName>rjw_genes_femboy</defName>
+	    <label>femboy</label>
+	    <description>Males with this gene are considered female despite having a penis</description>
+	    <iconPath>Genes/Icons/Futa</iconPath>
+	    <geneClass>RJW_Genes.Gene_Femboy</geneClass>
+	    <displayOrderInCategory>709</displayOrderInCategory>
+	    <exclusionTags>
+		    <li>PenisAmount</li>
+		    <li>VaginaAmount</li>
+	    </exclusionTags>
+    </GeneDef>
+	
  <GeneDef ParentName="GeneExtraGenitaliaBase">
    <defName>rjw_genes_featureless_chest</defName>
    <label>Featureless Chest</label>
@ -133,13 +147,11 @@
      <li>BreastAmount</li>
    </exclusionTags>
  </GeneDef>
-  <!-- 
-  See Comment in `RJW_Genes.Gene_UdderBreasts` why this is currently commented out.

  <GeneDef ParentName="GeneExtraGenitaliaBase">
    <defName>rjw_genes_udder</defName>
    <label>udder</label>
-    <description>Carriers of this gene have udders instead of breasts.</description>
+    <description>Carriers of this gene have udders and breasts.</description>
    <iconPath>Things/Mote/Heart</iconPath>
    <geneClass>RJW_Genes.Gene_UdderBreasts</geneClass>
    <displayOrderInCategory>711</displayOrderInCategory>
@ -147,5 +159,5 @@
      <li>BreastAmount</li>
    </exclusionTags>
  </GeneDef>
-  -->
+
 </Defs>
--- a/Common/Defs/GeneDefs/GeneDefs_GenitaliaSizes.xml
+++ b/Common/Defs/GeneDefs/GeneDefs_GenitaliaSizes.xml
@ -111,4 +111,26 @@
      <li>AnusSize</li>
    </exclusionTags>
  </GeneDef>
+
+  <!-- Extra -->
+  
+  <GeneDef ParentName="GeneGenitaliaSizeBase">
+    <defName>rjw_genes_evergrowth</defName>
+    <label>Evergrowth</label>
+    <description>One of the most regretted gene-modifications in the Glitterworlds: The (primary) genitalia will continue growing forever. This affects size and fluid output. Excessive growth can also effect mental stability! (Resizing takes place at 20th Birthday)</description>
+    <iconPath>Genes/Icons/Big_Male_Genitalia</iconPath>
+    <geneClass>RJW_Genes.Gene_EvergrowingGenitalia</geneClass>
+    <displayOrderInCategory>767</displayOrderInCategory>
+    <exclusionTags>
+      <li>PenisSize</li>
+      <li>VaginaSize</li>
+    </exclusionTags>
+    <modExtensions>
+        	<li Class="RJW_Genes.TickIntervalExtension">
+				<!-- One day has 60k ticks-->
+				<tickInterval>60000</tickInterval>
+			</li>
+		</modExtensions>
+  </GeneDef> 
+  
 </Defs>
--- a/Common/Defs/GeneDefs/GeneDefs_GenitaliaTypes.xml
+++ b/Common/Defs/GeneDefs/GeneDefs_GenitaliaTypes.xml
@ -3,9 +3,11 @@

  <GeneDef Name="GeneGenitalTypeBase" Abstract="True">
    <displayCategory>rjw_genes_genitalia_type</displayCategory>
+    <geneClass>RJW_Genes.Gene_GenitaliaType</geneClass>
    <exclusionTags>
      <li>GenitalType</li>
    </exclusionTags>
+	  <randomChosen>false</randomChosen>
    <biostatCpx>0</biostatCpx>
    
    <modExtensions>
@ -21,7 +23,28 @@
    <label>equine genitalia</label>
    <description>Carriers of this gene develop equine genitalia.</description>
    <iconPath>Genes/Icons/Genitalia_Equine</iconPath>
-    <geneClass>RJW_Genes.Gene_EquineGenitalia</geneClass>
+    <modExtensions>
+      <li Class="RJW_Genes.GenitaliaTypeExtension">
+        <penis>HorsePenis</penis>
+        <vagina>HorseVagina</vagina>
+        <anus>GenericAnus</anus>
+      </li>
+    </modExtensions>
+    <displayOrderInCategory>802</displayOrderInCategory>
+  </GeneDef>
+  
+   <GeneDef ParentName="GeneGenitalTypeBase">
+    <defName>rjw_genes_human_genitalia</defName>
+    <label>human genitalia</label>
+    <description>Carriers of this gene develop human genitalia.</description>
+    <iconPath>Genes/Icons/Genitalia_human</iconPath>
+    <modExtensions>
+      <li Class="RJW_Genes.GenitaliaTypeExtension">
+        <penis>Penis</penis>
+        <vagina>Vagina</vagina>
+        <anus>Anus</anus>
+      </li>
+    </modExtensions>
    <displayOrderInCategory>802</displayOrderInCategory>
  </GeneDef>
  
@ -30,7 +53,13 @@
    <label>canine genitalia</label>
    <description>Carriers of this gene develop canine genitalia.</description>
    <iconPath>Genes/Icons/Genitalia_Canine</iconPath>
-    <geneClass>RJW_Genes.Gene_CanineGenitalia</geneClass>
+    <modExtensions>
+      <li Class="RJW_Genes.GenitaliaTypeExtension">
+        <penis>DogPenis</penis>
+        <vagina>DogVagina</vagina>
+        <anus>GenericAnus</anus>
+      </li>
+    </modExtensions>
    <displayOrderInCategory>803</displayOrderInCategory>
  </GeneDef>

@ -39,7 +68,13 @@
    <label>feline genitalia</label>
    <description>Carriers of this gene develop feline genitalia.</description>
    <iconPath>Genes/Icons/Genitalia_Feline</iconPath>
-    <geneClass>RJW_Genes.Gene_FelineGenitalia</geneClass>
+    <modExtensions>
+      <li Class="RJW_Genes.GenitaliaTypeExtension">
+        <penis>CatPenis</penis>
+        <vagina>CatVagina</vagina>
+        <anus>GenericAnus</anus>
+      </li>
+    </modExtensions>
    <displayOrderInCategory>804</displayOrderInCategory>
  </GeneDef>

@ -48,7 +83,13 @@
    <label>demonic genitalia</label>
    <description>Carriers of this gene have demonic genitalia.</description>
    <iconPath>Genes/Icons/Genitalia_Demon</iconPath>
-    <geneClass>RJW_Genes.Gene_DemonicGenitalia</geneClass>
+    <modExtensions>
+      <li Class="RJW_Genes.GenitaliaTypeExtension">
+        <penis>DemonPenis</penis>
+        <vagina>DemonVagina</vagina>
+        <anus>DemonAnus</anus>
+      </li>
+    </modExtensions>
    <displayOrderInCategory>805</displayOrderInCategory>
  </GeneDef>

@ -57,7 +98,13 @@
    <label>dragon genitalia</label>
    <description>Carriers of this gene develop dragon genitalia.</description>
    <iconPath>Genes/Icons/Genitalia_Draconic</iconPath>
-    <geneClass>RJW_Genes.Gene_DragonGenitalia</geneClass>
+    <modExtensions>
+      <li Class="RJW_Genes.GenitaliaTypeExtension">
+        <penis>DragonPenis</penis>
+        <vagina>DragonVagina</vagina>
+        <anus>GenericAnus</anus>
+      </li>
+    </modExtensions>
    <displayOrderInCategory>806</displayOrderInCategory>
  </GeneDef>

@ -66,16 +113,196 @@
    <label>slime genitalia</label>
    <description>Carriers of this gene have slime genitalia.</description>
    <iconPath>Genes/Icons/Slime_Genitalia</iconPath>
-    <geneClass>RJW_Genes.Gene_SlimeGenitalia</geneClass>
+    <modExtensions>
+      <li Class="RJW_Genes.GenitaliaTypeExtension">
+        <penis>SlimeTentacles</penis>
+        <vagina>SlimeVagina</vagina>
+        <anus>SlimeAnus</anus>
+      </li>
+    </modExtensions>
    <displayOrderInCategory>807</displayOrderInCategory>
  </GeneDef>
  
+  <GeneDef ParentName="GeneGenitalTypeBase">
+    <defName>rjw_genes_demonicT_genitalia</defName>
+    <label>demonic tentacle genitalia</label>
+    <description>Carriers of this gene have demonic tentacle genitalia.</description>
+    <iconPath>Genes/Icons/Genitalia_tentacle_icon</iconPath>
+    <modExtensions>
+      <li Class="RJW_Genes.GenitaliaTypeExtension">
+        <penis>DemonTentaclePenis</penis>
+        <vagina>DemonVagina</vagina>
+        <anus>DemonAnus</anus>
+      </li>
+    </modExtensions>
+    <displayOrderInCategory>807</displayOrderInCategory>
+  </GeneDef>
+  
+  <GeneDef ParentName="GeneGenitalTypeBase">
+    <defName>rjw_genes_crocodilian_genitalia</defName>
+    <label>crocodilian genitalia</label>
+    <description>Carriers of this gene have crocodilian genitalia.</description>
+    <iconPath>Genes/Icons/Genitalia_croc_icon</iconPath>
+    <modExtensions>
+      <li Class="RJW_Genes.GenitaliaTypeExtension">
+        <penis>CrocodilianPenis</penis>
+      </li>
+    </modExtensions>
+    <displayOrderInCategory>807</displayOrderInCategory>
+  </GeneDef>
+  
+  <GeneDef ParentName="GeneGenitalTypeBase">
+    <defName>rjw_genes_racoon_genitalia</defName>
+    <label>racoon genitalia</label>
+    <description>Carriers of this gene have racoon genitalia.</description>
+    <iconPath>Genes/Icons/Genitalia_racoon_icon</iconPath>
+    <modExtensions>
+      <li Class="RJW_Genes.GenitaliaTypeExtension">
+        <penis>RaccoonPenis</penis>
+      </li>
+    </modExtensions>
+    <displayOrderInCategory>807</displayOrderInCategory>
+  </GeneDef>
+  
+  <GeneDef ParentName="GeneGenitalTypeBase">
+    <defName>rjw_genes_reptilian_genitalia</defName>
+    <label>reptilian genitalia</label>
+    <description>Carriers of this gene have reptilian genitalia.</description>
+    <iconPath>Genes/Icons/Genitalia_hemi_icon</iconPath>
+    <modExtensions>
+      <li Class="RJW_Genes.GenitaliaTypeExtension">
+        <penis>HemiPenis</penis>
+      </li>
+    </modExtensions>
+    <displayOrderInCategory>807</displayOrderInCategory>
+  </GeneDef>
+  
+  
+  
+  
+  
+  <GeneDef ParentName="GeneGenitalTypeBase">
+    <defName>rjw_genes_Ghost_genitalia</defName>
+    <label>ghost genitalia</label>
+    <description>Carriers of this gene have ghost genitalia.</description>
+    <iconPath>Genes/Icons/Genitalia_ghost_icon</iconPath>
+    <modExtensions>
+      <li Class="RJW_Genes.GenitaliaTypeExtension">
+        <penis>GhostPenis</penis>
+        <vagina>GhostVagina</vagina>
+      </li>
+    </modExtensions>
+    <displayOrderInCategory>807</displayOrderInCategory>
+  </GeneDef>
+  
+  <GeneDef ParentName="GeneGenitalTypeBase">
+    <defName>rjw_genes_Golem_genitalia</defName>
+    <label>golem genitalia</label>
+    <description>Carriers of this gene have rocky golem genitalia.</description>
+    <iconPath>Genes/Icons/penis_rock_icon</iconPath>
+    <modExtensions>
+      <li Class="RJW_Genes.GenitaliaTypeExtension">
+        <penis>GolemPenis</penis>
+      </li>
+    </modExtensions>
+    <displayOrderInCategory>807</displayOrderInCategory>
+  </GeneDef>  
+ 
+   <GeneDef ParentName="GeneGenitalTypeBase">
+    <defName>rjw_genes_Marine_genitalia</defName>
+    <label>marine genitalia</label>
+    <description>Carriers of this gene have marine mammal like genitalia.</description>
+    <iconPath>Genes/Icons/Genitalia_marine_icon</iconPath>
+    <modExtensions>
+      <li Class="RJW_Genes.GenitaliaTypeExtension">
+        <penis>MarinePenis</penis>
+      </li>
+    </modExtensions>
+    <displayOrderInCategory>807</displayOrderInCategory>
+  </GeneDef>  
+
+  <GeneDef ParentName="GeneGenitalTypeBase">
+    <defName>rjw_genes_Necro_genitalia</defName>
+    <label>undead genitalia</label>
+    <description>Carriers of this gene have necrotic undead genitalia.</description>
+    <iconPath>Genes/Icons/Genitalia_necro_icon</iconPath>
+    <modExtensions>
+      <li Class="RJW_Genes.GenitaliaTypeExtension">
+        <penis>NecroPenis</penis>
+      </li>
+    </modExtensions>
+    <displayOrderInCategory>807</displayOrderInCategory>
+  </GeneDef>  
+  
+  <GeneDef ParentName="GeneGenitalTypeBase">
+    <defName>rjw_genes_Needle_genitalia</defName>
+    <label>narrow genitalia</label>
+    <description>Carriers of this gene have very thin genitalia.</description>
+    <iconPath>Genes/Icons/Genitalia_thin_icon</iconPath>
+    <modExtensions>
+      <li Class="RJW_Genes.GenitaliaTypeExtension">
+        <penis>NeedlePenis</penis>
+        <vagina>NarrowVagina</vagina>
+      </li>
+    </modExtensions>
+    <displayOrderInCategory>807</displayOrderInCategory>
+  </GeneDef>  
+
+  <GeneDef ParentName="GeneGenitalTypeBase">
+    <defName>rjw_genes_Orc_genitalia</defName>
+    <label>orc genitalia</label>
+    <description>Carriers of this gene have orc genitalia.</description>
+    <iconPath>Genes/Icons/Genitalia_orc_icon</iconPath>
+    <modExtensions>
+      <li Class="RJW_Genes.GenitaliaTypeExtension">
+        <penis>OrcPenis</penis>
+      </li>
+    </modExtensions>
+    <displayOrderInCategory>807</displayOrderInCategory>
+  </GeneDef>  
+
+  <GeneDef ParentName="GeneGenitalTypeBase">
+    <defName>rjw_genes_Pig_genitalia</defName>
+    <label>screw genitalia</label>
+    <description>Carriers of this gene have screw genitalia.</description>
+    <iconPath>Genes/Icons/Genitalia_screw_icon</iconPath>
+    <modExtensions>
+      <li Class="RJW_Genes.GenitaliaTypeExtension">
+        <penis>PigPenis</penis>
+      </li>
+    </modExtensions>
+  </GeneDef>  
+
+  <GeneDef ParentName="GeneGenitalTypeBase">
+    <defName>rjw_genes_Tentacle_genitalia</defName>
+    <label>alien genitalia</label>
+    <description>Carriers of this gene have alien genitalia.</description>
+    <iconPath>Genes/Icons/Genitalia_alien_icon</iconPath>
+    <modExtensions>
+      <li Class="RJW_Genes.GenitaliaTypeExtension">
+        <penis>TentaclePenis</penis>
+      </li>
+    </modExtensions>
+    <displayOrderInCategory>807</displayOrderInCategory>
+  </GeneDef>  
+
+
+
+
+
+
  <GeneDef ParentName="GeneGenitalTypeBase">
    <defName>rjw_genes_ovipositor_genitalia</defName>
    <label>insect genitalia</label>
    <description>Carriers of this gene have ovipositors similar to insects.</description>
    <iconPath>Genes/Icons/Ovipositor_Genitalia</iconPath>
-    <geneClass>RJW_Genes.Gene_OvipositorGenitalia</geneClass>
+    <modExtensions>
+      <li Class="RJW_Genes.GenitaliaTypeExtension">
+        <penis>OvipositorM</penis>
+        <vagina>OvipositorF</vagina>
+        <anus>InsectAnus</anus>
+      </li>
+    </modExtensions>
    <displayOrderInCategory>808</displayOrderInCategory>

    <exclusionTags>
--- a/Common/Defs/GeneDefs/GeneDefs_Hive.xml
+++ b/Common/Defs/GeneDefs/GeneDefs_Hive.xml
@ -1,214 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<Defs>
-
-	<GeneDef Name="HiveBase" Abstract="True">
-		<displayCategory>rjw_genes_hive</displayCategory>
-		
-		<modExtensions>
-				<li MayRequire="OskarPotocki.VanillaFactionsExpanded.Core" Class="VanillaGenesExpanded.GeneExtension">
-					<backgroundPathEndogenes>Genes/Icons/RJW_Genes_Endogene_Background</backgroundPathEndogenes>
-					<backgroundPathXenogenes>Genes/Icons/RJW_Genes_Xenogene_Background</backgroundPathXenogenes>
-				</li>
-			</modExtensions>
-	</GeneDef>
-
-	<GeneDef ParentName="HiveBase">
-		<defName>rjw_genes_queen</defName>
-		<label>Hive Queen</label>
-		<labelShortAdj>queen</labelShortAdj>
-		<description>This gene represents the royal caste amongst its xenotype. Children of a queen are usually born as sterile workers, unless the father was a drone. Having multiple (adult) queens leads to intense rivalry and can throw the whole colony into chaos!</description>
-		<iconPath>Genes/Icons/Queen</iconPath>
-		<displayOrderInCategory>1</displayOrderInCategory>
-
-		<statOffsets>
-			<PsychicSensitivity>0.5</PsychicSensitivity>
-			<MeditationFocusGain>0.25</MeditationFocusGain>
-		</statOffsets>
-
-		
-		<conditionalStatAffecters>
-			<li Class="RJW_Genes.ConditionalStatAffecter_MultipleQueens">
-				<statFactors>
-					<MoveSpeed>0.7</MoveSpeed>
-				</statFactors>
-				<statOffsets>
-					<WorkSpeedGlobal>-0.5</WorkSpeedGlobal>
-				</statOffsets>
-			</li>
-			<li Class="RJW_Genes.ConditionalStatAffecter_QueenCloseBy">
-				<statFactors>
-					<MoveSpeed>0.4</MoveSpeed>
-					<WorkSpeedGlobal>0.2</WorkSpeedGlobal>
-				</statFactors>
-			</li>
-		</conditionalStatAffecters>
-
-		<exclusionTags>
-			<li>rjw_genes_hive_caste</li>
-			<li>rjw_genes_swearing_loyalty</li>
-		</exclusionTags>
-
-		<biostatCpx>7</biostatCpx>
-		<biostatMet>-3</biostatMet>
-	</GeneDef>
-
-	<GeneDef ParentName="HiveBase">
-		<defName>rjw_genes_drone</defName>
-		<label>Hive Drone</label>
-		<labelShortAdj>drone</labelShortAdj>
-		<description>This gene represents the drone caste amongst its xenotype. Drones are highly specialised experts that ensure the hives functioning. Other than that, drones are the only xenotypes capable of producing fertile offspring with a queen.</description>
-		<iconPath>Genes/Icons/Drone</iconPath>
-		<displayOrderInCategory>2</displayOrderInCategory>
-
-		<exclusionTags>
-			<li>rjw_genes_hive_caste</li>
-		</exclusionTags>
-
-		<conditionalStatAffecters>
-			<li Class="RJW_Genes.ConditionalStatAffecter_QueenAbsent">
-				<statFactors>
-					<MoveSpeed>0.9</MoveSpeed>
-				</statFactors>
-				<statOffsets>
-					<WorkSpeedGlobal>-0.1</WorkSpeedGlobal>
-				</statOffsets>
-			</li>
-		</conditionalStatAffecters>
-
-		<biostatCpx>4</biostatCpx>
-		<biostatMet>-2</biostatMet>
-	</GeneDef>
-
-
-	<GeneDef ParentName="HiveBase">
-		<defName>rjw_genes_worker</defName>
-		<label>Hive Worker</label>
-		<labelShortAdj>worker</labelShortAdj>
-		<description>This gene marks the lowest caste of a hive, the workers. Usually sterile, they are despised by higher castes and only live to serve with labour.</description>
-		<iconPath>Genes/Icons/Worker</iconPath>
-		<displayOrderInCategory>3</displayOrderInCategory>
-
-		<exclusionTags>
-			<li>rjw_genes_hive_caste</li>
-		</exclusionTags>
-
-		<conditionalStatAffecters>
-			<li Class="RJW_Genes.ConditionalStatAffecter_QueenAbsent">
-				<statFactors>
-					<MoveSpeed>0.7</MoveSpeed>
-				</statFactors>
-				<statOffsets>
-					<WorkSpeedGlobal>-0.5</WorkSpeedGlobal>
-				</statOffsets>
-			</li>
-			<li Class="RJW_Genes.ConditionalStatAffecter_MultipleQueens">
-				<statFactors>
-					<MoveSpeed>0.7</MoveSpeed>
-				</statFactors>
-				<statOffsets>
-					<WorkSpeedGlobal>-0.5</WorkSpeedGlobal>
-				</statOffsets>
-			</li>
-			<li Class="RJW_Genes.ConditionalStatAffecter_QueenCloseBy">
-				<statFactors>
-					<MoveSpeed>1.2</MoveSpeed>
-					<WorkSpeedGlobal>1.2</WorkSpeedGlobal>
-				</statFactors>
-			</li>
-		</conditionalStatAffecters>
-
-		<biostatCpx>1</biostatCpx>
-		<biostatMet>0</biostatMet>
-	</GeneDef>
-
-	<GeneDef ParentName="HiveBase">
-		<defName>rjw_genes_zealous_loyalty</defName>
-		<label>Zealous Loyalty</label>
-		<labelShortAdj>loyalty</labelShortAdj>
-		<description>Carriers of this gene are genetically wired to worship carriers of the 'Queen'-gene. They receive a massive relation-ship bonus towards the queen and a slight mood bonus. Having multiple queens in the colony causes severe distress.</description>
-		<iconPath>Genes/Icons/Loyalty</iconPath>
-		<displayOrderInCategory>10</displayOrderInCategory>
-		
-		<exclusionTags>
-			<li>rjw_genes_swearing_loyalty</li>
-		</exclusionTags>
-
-		<biostatCpx>1</biostatCpx>
-		<biostatMet>-1</biostatMet>
-
-		<modExtensions>
-			<li MayRequire="OskarPotocki.VanillaFactionsExpanded.Core" Class="VanillaGenesExpanded.GeneExtension">
-				<backgroundPathEndogenes>Genes/Icons/RJW_Genes_Endogene_Background</backgroundPathEndogenes>
-				<backgroundPathXenogenes>Genes/Icons/RJW_Genes_Xenogene_Background</backgroundPathXenogenes>
-			</li>
-		</modExtensions>
-	</GeneDef>
-
-	<GeneDef ParentName="HiveBase">
-		<defName>rjw_genes_cocoonweaver</defName>
-		<label>Cocoon Weaver</label>
-		<labelShortAdj>cocooner</labelShortAdj>
-		<description>Carriers of this gene can produce a cocoon to prepare helpless (or willing) victims for breeding.</description>
-		<iconPath>Genes/Icons/Cocoon</iconPath>
-		<displayOrderInCategory>11</displayOrderInCategory>
-		<abilities>
-			<li>rjw_genes_ability_cocoonweaver</li>
-		</abilities>
-		<descriptionHyperlinks>
-			<AbilityDef>rjw_genes_ability_cocoonweaver</AbilityDef>
-		</descriptionHyperlinks>
-		<biostatCpx>1</biostatCpx>
-		<biostatMet>-1</biostatMet>
-	</GeneDef>
-	
-	<GeneDef ParentName="HiveBase">
-		<defName>rjw_genes_spawn_spelopede</defName>
-		<label>Spelopede Dispenser</label>
-		<labelShortAdj>spelopede</labelShortAdj>
-		<description>Carriers of this gene can generate tame spelopedes. Higher psychic-sensitivity will spawn more spelopedes.</description>
-		<iconPath>Genes/Icons/Spelopede_Dispenser</iconPath>
-		<displayOrderInCategory>12</displayOrderInCategory>
-		<abilities>
-			<li>rjw_genes_ability_spawn_spelopede</li>
-		</abilities>
-		<descriptionHyperlinks>
-			<AbilityDef>rjw_genes_ability_spawn_spelopede</AbilityDef>
-		</descriptionHyperlinks>
-		<biostatCpx>1</biostatCpx>
-		<biostatMet>-1</biostatMet>
-	</GeneDef>
-
-	
-  <GeneDef ParentName="HiveBase">
-    <defName>rjw_genes_insectincubator</defName>
-    <label>Insect Incubator</label>	
-	<geneClass>RJW_Genes.Gene_InsectIncubator</geneClass>
-    <description>Pawns with this gene are able to hold more insect eggs.</description>
-    <iconPath>Genes/Icons/Egg</iconPath>
-    <displayOrderInCategory>52</displayOrderInCategory>
-    <biostatCpx>1</biostatCpx>
-    <biostatMet>-1</biostatMet>
-  </GeneDef>
-
-  <GeneDef ParentName="HiveBase">
-    <defName>rjw_genes_insectbreeder</defName>
-    <label>Insect Breeder</label>	
-    <description>Pawns with this gene are able to fertilize eggs with any fertile penis.</description>
-    <iconPath>Genes/Icons/Insect_Breeder</iconPath>
-    <displayOrderInCategory>53</displayOrderInCategory>
-    <biostatCpx>1</biostatCpx>
-    <biostatMet>-1</biostatMet>
-  </GeneDef>
-  
-  <GeneDef>
-    <defName>rjw_genes_fervent_ovipositor</defName>
-    <label>Fervent Ovipositor</label>	
-	<geneClass>RJW_Genes.Gene_FerventOvipositor</geneClass>
-    <description>Pawns that have a female (egg producing) ovipositor produce eggs at drastically increased speed.</description>
-    <iconPath>Genes/Icons/Fervent_Ovipositor</iconPath>
-    <displayOrderInCategory>55</displayOrderInCategory>
-    <biostatCpx>1</biostatCpx>
-    <biostatMet>-1</biostatMet>
-  </GeneDef>
-  
-</Defs>
--- a/Common/Defs/GeneDefs/GeneDefs_LifeForce.xml
+++ b/Common/Defs/GeneDefs/GeneDefs_LifeForce.xml
@ -1,6 +1,18 @@
 <?xml version="1.0" encoding="utf-8" ?>
 <Defs>
-	<GeneDef>
+	
+	<GeneDef Name="LifeForceBase" Abstract="True">
+		<displayCategory>rjw_genes_fertilin</displayCategory>
+		
+		<modExtensions>
+			<li MayRequire="OskarPotocki.VanillaFactionsExpanded.Core" Class="VanillaGenesExpanded.GeneExtension">
+				<backgroundPathEndogenes>Genes/Icons/RJW_Genes_Endogene_Background</backgroundPathEndogenes>
+				<backgroundPathXenogenes>Genes/Icons/RJW_Genes_Xenogene_Background</backgroundPathXenogenes>
+			</li>
+		</modExtensions>
+	</GeneDef>
+
+	<GeneDef ParentName="LifeForceBase">
 		<defName>rjw_genes_lifeforce</defName>
 		<label>fertilin</label>
 		<description>Carriers of this gene have a reserve of biological strength powered by a resource called fertilin. The resource can be gained and spent in various ways, some of which are unlocked by other genes.\n\nCarriers lose 5 fertilin per day from biological entropy. \n\nGene is inactive until carrier is able to have sex.</description>
@ -17,7 +29,6 @@
 		<resourceDescription>A reserve of biological strength which can be gained and spent in a variety of ways. \n\nFertilin can be increased by absorbing cum, typically through oral sex or stored cum. \n\nIf fertilin reaches zero, {PAWN_nameDef} will become very unhappy and may try to obtain some forcefully.</resourceDescription>
 		<iconPath>Genes/Icons/FertilinAlt</iconPath>
 		<selectionWeight>0</selectionWeight>
-		<displayCategory>rjw_genes_fertilin</displayCategory>
 		<displayOrderInCategory>-2</displayOrderInCategory>
    	<minAgeActive>18</minAgeActive>
 		<customEffectDescriptions>
@ -28,43 +39,28 @@
 			<li><symbol>fert</symbol></li>
 		  </prefixSymbols>
 		</symbolPack>
-		<resourceLossPerDay>0.05</resourceLossPerDay>
+		<resourceLossPerDay>0.025</resourceLossPerDay>
 		<biostatCpx>1</biostatCpx>
 		<biostatMet>1</biostatMet>
-
-		<modExtensions>
-			<li MayRequire="OskarPotocki.VanillaFactionsExpanded.Core" Class="VanillaGenesExpanded.GeneExtension">
-				<backgroundPathEndogenes>Genes/Icons/RJW_Genes_Endogene_Background</backgroundPathEndogenes>
-				<backgroundPathXenogenes>Genes/Icons/RJW_Genes_Xenogene_Background</backgroundPathXenogenes>
-			</li>
-		</modExtensions>
 	</GeneDef>
 	
-	<GeneDef>
+	<GeneDef ParentName="LifeForceBase">
 		<defName>rjw_genes_lifeforce_drain</defName>
 		<label>fertilin drain</label>
 		<labelShortAdj>draining</labelShortAdj>
-		<description>Carriers lose an additional 15 fertilin per day from biological entropy.</description>
+		<description>Carriers lose an additional 7.5 fertilin per day from biological entropy.</description>
 		<resourceLabel>fertilin</resourceLabel>
 		<geneClass>RJW_Genes.Gene_LifeForceDrain</geneClass>
 		<iconPath>Genes/Icons/FertilinDrainAlt</iconPath>
 		<prerequisite>rjw_genes_lifeforce</prerequisite>
-		<resourceLossPerDay>0.15</resourceLossPerDay>
-		<displayCategory>rjw_genes_fertilin</displayCategory>
+		<resourceLossPerDay>0.075</resourceLossPerDay>
    	<minAgeActive>18</minAgeActive>
 		<displayOrderInCategory>-1</displayOrderInCategory>
 		<biostatCpx>1</biostatCpx>
 		<biostatMet>6</biostatMet>
-
-		<modExtensions>
-			<li MayRequire="OskarPotocki.VanillaFactionsExpanded.Core" Class="VanillaGenesExpanded.GeneExtension">
-				<backgroundPathEndogenes>Genes/Icons/RJW_Genes_Endogene_Background</backgroundPathEndogenes>
-				<backgroundPathXenogenes>Genes/Icons/RJW_Genes_Xenogene_Background</backgroundPathXenogenes>
-			</li>
-		</modExtensions>
 	</GeneDef>
 	
-	<GeneDef>
+	<GeneDef ParentName="LifeForceBase">
 		<defName>rjw_genes_pussyhealing</defName>
 		<label>Pussy Healer</label>
 		<labelShortAdj>pussyhealer</labelShortAdj>
@ -72,7 +68,6 @@
 		<iconPath>Genes/Icons/Healpussy</iconPath>
 		<prerequisite>rjw_genes_lifeforce</prerequisite>
 		<displayOrderInCategory>9</displayOrderInCategory>
-		<displayCategory>rjw_genes_fertilin</displayCategory>
 		<abilities>
 			<li>rjw_genes_ability_pussyheal</li>
 		</abilities>
@ -88,16 +83,9 @@
 				<li><symbol>heal</symbol></li>
 			</suffixSymbols>
 		</symbolPack>
-
-		<modExtensions>
-			<li MayRequire="OskarPotocki.VanillaFactionsExpanded.Core" Class="VanillaGenesExpanded.GeneExtension">
-				<backgroundPathEndogenes>Genes/Icons/RJW_Genes_Endogene_Background</backgroundPathEndogenes>
-				<backgroundPathXenogenes>Genes/Icons/RJW_Genes_Xenogene_Background</backgroundPathXenogenes>
-			</li>
-		</modExtensions>
 	</GeneDef>
 	
-	<GeneDef>
+	<GeneDef ParentName="LifeForceBase">
 		<defName>rjw_genes_cockeater</defName>
 		<label>Cockeater</label>
 		<labelShortAdj>cockeater</labelShortAdj>
@ -105,7 +93,6 @@
 		<iconPath>Genes/Icons/cockeater</iconPath>
 		<prerequisite>rjw_genes_lifeforce</prerequisite>
 		<displayOrderInCategory>11</displayOrderInCategory>
-		<displayCategory>rjw_genes_fertilin</displayCategory>
 		<abilities>
 			<li>rjw_genes_ability_cockeater</li>
 		</abilities>
@ -121,16 +108,9 @@
 				<li><symbol>eat</symbol></li>
 			</suffixSymbols>
 		</symbolPack>
-
-		<modExtensions>
-			<li MayRequire="OskarPotocki.VanillaFactionsExpanded.Core" Class="VanillaGenesExpanded.GeneExtension">
-				<backgroundPathEndogenes>Genes/Icons/RJW_Genes_Endogene_Background</backgroundPathEndogenes>
-				<backgroundPathXenogenes>Genes/Icons/RJW_Genes_Xenogene_Background</backgroundPathXenogenes>
-			</li>
-		</modExtensions>
 	</GeneDef>
 	
-	<GeneDef>
+	<GeneDef ParentName="LifeForceBase">
 		<defName>rjw_genes_paralysingkiss</defName>
 		<label>paralysing kiss</label>
 		<labelShortAdj>paralysing kiss</labelShortAdj>
@ -138,7 +118,6 @@
 		<iconPath>Genes/Icons/Paralysing_Kiss</iconPath>
 		<prerequisite>rjw_genes_lifeforce</prerequisite>
 		<displayOrderInCategory>12</displayOrderInCategory>
-		<displayCategory>rjw_genes_fertilin</displayCategory>
 		<abilities>
 			<li>rjw_genes_ability_paralysingkiss</li>
 		</abilities>
@ -153,16 +132,9 @@
 				<li><symbol>kiss</symbol></li>
 			</suffixSymbols>
 		</symbolPack>
-
-		<modExtensions>
-			<li MayRequire="OskarPotocki.VanillaFactionsExpanded.Core" Class="VanillaGenesExpanded.GeneExtension">
-				<backgroundPathEndogenes>Genes/Icons/RJW_Genes_Endogene_Background</backgroundPathEndogenes>
-				<backgroundPathXenogenes>Genes/Icons/RJW_Genes_Xenogene_Background</backgroundPathXenogenes>
-			</li>
-		</modExtensions>
 	</GeneDef>
 	
-	<GeneDef>
+	<GeneDef ParentName="LifeForceBase">
 		<defName>rjw_genes_seduce</defName>
 		<label>seduction</label>
 		<labelShortAdj>seduction</labelShortAdj>
@ -170,7 +142,6 @@
 		<iconPath>Genes/Icons/seduce</iconPath>
 		<prerequisite>rjw_genes_lifeforce</prerequisite>
 		<displayOrderInCategory>13</displayOrderInCategory>
-		<displayCategory>rjw_genes_fertilin</displayCategory>
 		<abilities>
 			<li>rjw_genes_ability_seduce</li>
 		</abilities>
@ -186,23 +157,15 @@
 				<li><symbol>kiss</symbol></li>
 			</suffixSymbols>
 		</symbolPack>
-
-		<modExtensions>
-			<li MayRequire="OskarPotocki.VanillaFactionsExpanded.Core" Class="VanillaGenesExpanded.GeneExtension">
-				<backgroundPathEndogenes>Genes/Icons/RJW_Genes_Endogene_Background</backgroundPathEndogenes>
-				<backgroundPathXenogenes>Genes/Icons/RJW_Genes_Xenogene_Background</backgroundPathXenogenes>
-			</li>
-		</modExtensions>
 	</GeneDef>
 	
-	<GeneDef>
+	<GeneDef ParentName="LifeForceBase">
 		<defName>rjw_genes_naked_prowess</defName>
 		<label>naked prowess</label>
 		<description>Carriers of this gene are able to temporarily increase their strength and resilience, while they are naked.</description>
 		<iconPath>Genes/Icons/rjw_naked_prowess</iconPath>
 		<prerequisite>rjw_genes_lifeforce</prerequisite>
-		<displayOrderInCategory>13</displayOrderInCategory>
-		<displayCategory>rjw_genes_fertilin</displayCategory>
+		<displayOrderInCategory>14</displayOrderInCategory>
 		<abilities>
 			<li>rjw_genes_ability_naked_prowess</li>
 		</abilities>
@ -211,67 +174,64 @@
 		</descriptionHyperlinks>
 		<biostatCpx>1</biostatCpx>
 		<biostatMet>-1</biostatMet>
-
-		<modExtensions>
-			<li MayRequire="OskarPotocki.VanillaFactionsExpanded.Core" Class="VanillaGenesExpanded.GeneExtension">
-				<backgroundPathEndogenes>Genes/Icons/RJW_Genes_Endogene_Background</backgroundPathEndogenes>
-				<backgroundPathXenogenes>Genes/Icons/RJW_Genes_Xenogene_Background</backgroundPathXenogenes>
-			</li>
-		</modExtensions>
 	</GeneDef>
 	
-	<GeneDef>
+	<GeneDef ParentName="LifeForceBase">
 		<defName>rjw_genes_cum_eater</defName>
 		<label>Cum eater</label>
 		<description>Carriers of this gene are able to absorb fertilin through eating cum. This includes oral sex, eating cum for food or sucking out cumflated pawns. </description>
 		<iconPath>Genes/Icons/cumeater</iconPath>
 		<prerequisite>rjw_genes_lifeforce</prerequisite>
 		<displayOrderInCategory>1</displayOrderInCategory>
-		<displayCategory>rjw_genes_fertilin</displayCategory>
 		<biostatCpx>1</biostatCpx>
-
-		<modExtensions>
-			<li MayRequire="OskarPotocki.VanillaFactionsExpanded.Core" Class="VanillaGenesExpanded.GeneExtension">
-				<backgroundPathEndogenes>Genes/Icons/RJW_Genes_Endogene_Background</backgroundPathEndogenes>
-				<backgroundPathXenogenes>Genes/Icons/RJW_Genes_Xenogene_Background</backgroundPathXenogenes>
-			</li>
-		</modExtensions>
 	</GeneDef>
 	
-	<GeneDef>
+	<GeneDef ParentName="LifeForceBase">
 		<defName>rjw_genes_fertilin_absorber</defName>
 		<label>Fertilin Absorber</label>
 		<description>Carriers of this gene are able to absorb the fertilin inside sperm through their vagina and anus.</description>
 		<iconPath>Genes/Icons/Vaginal_cum_absorption</iconPath>
 		<prerequisite>rjw_genes_lifeforce</prerequisite>
 		<displayOrderInCategory>2</displayOrderInCategory>
-		<displayCategory>rjw_genes_fertilin</displayCategory>
 		<biostatCpx>1</biostatCpx>
+	</GeneDef>
+	
+	<GeneDef ParentName="LifeForceBase">
+		<defName>rjw_genes_lifeforce_empath</defName>
+		<label>empathic lifeforce</label>
+		<geneClass>RJW_Genes.Gene_LifeForce_Empath</geneClass>
+		<description>Carriers of this gene generate lifeforce if nearby pawns are sexually satisfied. Be careful: Sexually frustrated pawns will make your empath loose lifeforce!</description>
+		<iconPath>Genes/Icons/Hypersexual</iconPath>
+		<prerequisite>rjw_genes_lifeforce</prerequisite>
+		<displayOrderInCategory>3</displayOrderInCategory>
+		<biostatCpx>3</biostatCpx>
+		<biostatMet>-2</biostatMet>

 		<modExtensions>
-			<li MayRequire="OskarPotocki.VanillaFactionsExpanded.Core" Class="VanillaGenesExpanded.GeneExtension">
-				<backgroundPathEndogenes>Genes/Icons/RJW_Genes_Endogene_Background</backgroundPathEndogenes>
-				<backgroundPathXenogenes>Genes/Icons/RJW_Genes_Xenogene_Background</backgroundPathXenogenes>
+			<li Class="RJW_Genes.LifeForceEmpathExtension">
+				<aheagoIncrement>0.02</aheagoIncrement>
+				<satisfactionIncrement>0.01</satisfactionIncrement>
+				<frustratedDecrement>-0.01</frustratedDecrement>
+			</li>
+			<li Class="RJW_Genes.TickIntervalExtension">
+				<!-- One day has 60k ticks, so we check every hour with 60000/24 = 2500-->
+				<tickInterval>2500</tickInterval>
+			</li>
+			<li Class="RJW_Genes.DistanceExtension">
+				<!-- distance 25 means 25 tiles in every direction from the empath.-->
+				<distance>25</distance>
 			</li>
 		</modExtensions>
 	</GeneDef>

-	<GeneDef>
+	<GeneDef ParentName="LifeForceBase">
 		<defName>rjw_genes_drainer</defName>
 		<label>vitality drainer</label>
 		<description>Carriers of this gene are able to absorb a great amount of fertilin by draining the vitality of the partner. This is done passively through having sex with a non-drained pawn that does not have this gene.</description>
 		<iconPath>Genes/Icons/Vitality_Drainer</iconPath>
 		<prerequisite>rjw_genes_lifeforce</prerequisite>
 		<displayOrderInCategory>4</displayOrderInCategory>
-		<displayCategory>rjw_genes_fertilin</displayCategory>
 		<biostatCpx>1</biostatCpx>
 		<biostatMet>-1</biostatMet>
-
-		<modExtensions>
-			<li MayRequire="OskarPotocki.VanillaFactionsExpanded.Core" Class="VanillaGenesExpanded.GeneExtension">
-				<backgroundPathEndogenes>Genes/Icons/RJW_Genes_Endogene_Background</backgroundPathEndogenes>
-				<backgroundPathXenogenes>Genes/Icons/RJW_Genes_Xenogene_Background</backgroundPathXenogenes>
-			</li>
-		</modExtensions>
 	</GeneDef>
 </Defs>
--- a/Common/Defs/GeneDefs/GeneDefs_Reproduction.xml
+++ b/Common/Defs/GeneDefs/GeneDefs_Reproduction.xml
@ -14,6 +14,7 @@
            </li>
        </forcedTraits>

+        <randomChosen>false</randomChosen>
        <modExtensions>
 			<li MayRequire="OskarPotocki.VanillaFactionsExpanded.Core" Class="VanillaGenesExpanded.GeneExtension">
 				<backgroundPathEndogenes>Genes/Icons/RJW_Genes_Endogene_Background</backgroundPathEndogenes>
@ -36,6 +37,54 @@
            </li>
        </forcedTraits>

+        <randomChosen>false</randomChosen>
+        <modExtensions>
+			<li MayRequire="OskarPotocki.VanillaFactionsExpanded.Core" Class="VanillaGenesExpanded.GeneExtension">
+				<backgroundPathEndogenes>Genes/Icons/RJW_Genes_Endogene_Background</backgroundPathEndogenes>
+				<backgroundPathXenogenes>Genes/Icons/RJW_Genes_Xenogene_Background</backgroundPathXenogenes>
+			</li>
+		</modExtensions>
+    </GeneDef>
+	
+    <!-- 
+	<GeneDef>
+        <defName>rjw_genes_sadist_gene</defName>
+        <label>Sadist</label>
+        <displayCategory>Reproduction</displayCategory>
+        <description>Xenotypes with this Gene are Sadists.</description>
+        <iconPath>Genes/Icons/Rape</iconPath>
+        <biostatMet>1</biostatMet>
+        <displayOrderInCategory>2</displayOrderInCategory>    
+        <forcedTraits>
+            <li>
+                <def>rjw_genes_sadist</def>
+            </li>
+        </forcedTraits>
+
+        <modExtensions>
+			<li MayRequire="OskarPotocki.VanillaFactionsExpanded.Core" Class="VanillaGenesExpanded.GeneExtension">
+				<backgroundPathEndogenes>Genes/Icons/RJW_Genes_Endogene_Background</backgroundPathEndogenes>
+				<backgroundPathXenogenes>Genes/Icons/RJW_Genes_Xenogene_Background</backgroundPathXenogenes>
+			</li>
+		</modExtensions>
+    </GeneDef>
+	-->
+
+	<GeneDef>
+        <defName>rjw_genes_masochist</defName>
+        <label>Masochist</label>
+        <displayCategory>Reproduction</displayCategory>
+        <description>Xenotypes with this Gene are Masochists.</description>
+        <iconPath>Genes/Icons/Rape</iconPath>
+        <biostatMet>1</biostatMet>
+        <displayOrderInCategory>2</displayOrderInCategory>    
+        <forcedTraits>
+            <li>
+                <def>Masochist</def>
+            </li>
+        </forcedTraits>
+
+        <randomChosen>false</randomChosen>
        <modExtensions>
 			<li MayRequire="OskarPotocki.VanillaFactionsExpanded.Core" Class="VanillaGenesExpanded.GeneExtension">
 				<backgroundPathEndogenes>Genes/Icons/RJW_Genes_Endogene_Background</backgroundPathEndogenes>
@ -61,6 +110,7 @@
            <li>rjw_genes_sexual_orientation</li>
        </exclusionTags>

+        <randomChosen>false</randomChosen>
        <modExtensions>
 			<li MayRequire="OskarPotocki.VanillaFactionsExpanded.Core" Class="VanillaGenesExpanded.GeneExtension">
 				<backgroundPathEndogenes>Genes/Icons/RJW_Genes_Endogene_Background</backgroundPathEndogenes>
@ -86,6 +136,7 @@
            <li>rjw_genes_sexual_orientation</li>
        </exclusionTags>

+        <randomChosen>false</randomChosen>
        <modExtensions>
 			<li MayRequire="OskarPotocki.VanillaFactionsExpanded.Core" Class="VanillaGenesExpanded.GeneExtension">
 				<backgroundPathEndogenes>Genes/Icons/RJW_Genes_Endogene_Background</backgroundPathEndogenes>
@ -94,4 +145,42 @@
 		</modExtensions>
    </GeneDef>

+
+  <GeneDef>
+    <defName>rjw_genes_no_sex_need</defName>
+    <label>Asexual</label>
+    <description>Carriers of this gene do not have a sex-need. They can still participate in sex, </description>
+    <iconPath>Genes/Icons/Empty</iconPath>
+    <displayOrderInCategory>5</displayOrderInCategory>
+    <disablesNeeds>
+      <li>Sex</li>
+    </disablesNeeds>
+    <biostatMet>-1</biostatMet>
+    <biostatCpx>2</biostatCpx>
+    
+    <randomChosen>false</randomChosen>
+    <exclusionTags>
+        <li>rjw_genes_sexual_orientation</li>
+    </exclusionTags>
+
+    <modExtensions>
+        <li MayRequire="OskarPotocki.VanillaFactionsExpanded.Core" Class="VanillaGenesExpanded.GeneExtension">
+            <backgroundPathEndogenes>Genes/Icons/RJW_Genes_Endogene_Background</backgroundPathEndogenes>
+            <backgroundPathXenogenes>Genes/Icons/RJW_Genes_Xenogene_Background</backgroundPathXenogenes>
+        </li>
+    </modExtensions>
+  </GeneDef>
+  
+   <GeneDef>
+    <defName>LitteredBirths</defName>
+    <label>littered births</label>
+	<displayCategory>Reproduction</displayCategory>
+    <description>Female carriers of this gene birth litters instead of just one baby, with a chance of having two to four babies per pregnancy.</description>
+    <iconPath>Genes/Icons/Gene_LitteredBirths</iconPath>
+    <displayOrderInCategory>110</displayOrderInCategory>
+    <marketValueFactor>1.10</marketValueFactor>
+    <biostatMet>-2</biostatMet>
+    <biostatCpx>1</biostatCpx>
+  </GeneDef>
+
 </Defs>
--- a/Common/Defs/GeneDefs/GeneDefs_SexSpecial.xml
+++ b/Common/Defs/GeneDefs/GeneDefs_SexSpecial.xml
@ -65,6 +65,17 @@
        <displayOrderInCategory>4</displayOrderInCategory>
        <biostatCpx>1</biostatCpx>
        <biostatMet>1</biostatMet>
+
+        <modExtensions>
+			<li Class="RJW_Genes.TickIntervalExtension">
+				<!-- One day has 60k ticks, so we check every hour with 60000/48 = 1250-->
+				<tickInterval>1250</tickInterval>
+			</li>
+			<li Class="RJW_Genes.DistanceExtension">
+				<!-- distance 25 means 25 tiles in every direction from the pheromone-pawn.-->
+				<distance>25</distance>
+			</li>
+        </modExtensions>
    </GeneDef>
    
    <GeneDef ParentName="SpecialBase">
@ -78,4 +89,41 @@
        <biostatMet>-5</biostatMet>
    </GeneDef>    

+    <GeneDef ParentName="SpecialBase">
+        <defName>rjw_genes_hormonal_saliva</defName>
+        <label>Hormonal Saliva</label>
+        <description>The saliva of this xenotype stimulates growth in penises. Regular contact will lead to noticable growth.</description>
+        <biostatCpx>2</biostatCpx>
+        <biostatMet>-1</biostatMet>
+        <iconPath>Genes/Icons/Big_Male_Genitalia</iconPath>
+        <displayOrderInCategory>6</displayOrderInCategory>
+
+        <modExtensions>
+            <li Class="RJW_Genes.HormonalSalivaExtension">
+                <!-- SizeIncrement is applied "flat" -->
+                <sizeIncrement>0.02</sizeIncrement>
+                <maxBodySize>2.5</maxBodySize>
+                <!-- CumMultiplier is applied "exponential" -->
+                <cumMultiplier>1.05</cumMultiplier>
+            </li>
+        </modExtensions>
+    </GeneDef>
+
+    <GeneDef ParentName="SpecialBase">
+		<defName>rjw_genes_cocoonweaver</defName>
+		<label>Cocoon Weaver</label>
+		<labelShortAdj>cocooner</labelShortAdj>
+		<description>Carriers of this gene can produce a cocoon to prepare helpless (or willing) victims for breeding.</description>
+		<iconPath>Genes/Icons/Cocoon</iconPath>
+		<displayOrderInCategory>11</displayOrderInCategory>
+		<abilities>
+			<li>rjw_genes_ability_cocoonweaver</li>
+		</abilities>
+		<descriptionHyperlinks>
+			<AbilityDef>rjw_genes_ability_cocoonweaver</AbilityDef>
+		</descriptionHyperlinks>
+		<biostatCpx>1</biostatCpx>
+		<biostatMet>-1</biostatMet>
+	</GeneDef>
+
 </Defs>
--- a/Common/Defs/GeneDefs/GeneDefs_SpecifiedGender.xml
+++ b/Common/Defs/GeneDefs/GeneDefs_SpecifiedGender.xml
@ -46,4 +46,36 @@
        </modExtensions>
    </GeneDef>
    
+
+    <GeneDef>
+        <defName>rjw_genes_gender_fluid</defName>
+        <displayCategory>rjw_genes_gender</displayCategory>
+        <label>Gender Fluid</label>
+        <description>Everyday carriers of this gene might change their biological sex.</description>
+        <biostatCpx>0</biostatCpx>
+        <iconPath>Genes/Icons/Futa</iconPath>
+        <geneClass>RJW_Genes.Gene_GenderFluid</geneClass>
+        <displayOrderInCategory>2</displayOrderInCategory>
+        
+        <!-- Design Decision: GenderFluids like GenderFluids (slightly) more. -->
+        <missingGeneRomanceChanceFactor>0.9</missingGeneRomanceChanceFactor>
+
+        <exclusionTags>
+          <li>AG_Gender</li>
+          <li>Gender</li>          
+        </exclusionTags>
+
+        <modExtensions>
+          <li MayRequire="OskarPotocki.VanillaFactionsExpanded.Core" Class="VanillaGenesExpanded.GeneExtension">
+            <backgroundPathEndogenes>Genes/Icons/RJW_Genes_Endogene_Background</backgroundPathEndogenes>
+            <backgroundPathXenogenes>Genes/Icons/RJW_Genes_Xenogene_Background</backgroundPathXenogenes>
+          </li>
+          <li Class="RJW_Genes.GenderFluidExtension">
+                <!-- 120k = 2 days -->
+                <changeInterval>120000</changeInterval>
+                <changeChance>0.25</changeChance>
+          </li>
+        </modExtensions>
+    </GeneDef>
+
 </Defs>
--- a/Common/Defs/GeneDefs/Xenotype_Hive.xml
+++ b/Common/Defs/GeneDefs/Xenotype_Hive.xml
@ -1,124 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<Defs>
-
-  <!-- Alpha Genes ID: sarg.alphagenes -->
-
-  <XenotypeDef>
-    <defName>rjw_genes_halamyr_queen_xenotype</defName>
-    <label>Halamyr Queen</label>
-    <iconPath>Genes/Icons/Xenotypes/Xenotype-Queen</iconPath>
-    <inheritable>false</inheritable>
-    <canGenerateAsCombatant>false</canGenerateAsCombatant>
-
-    <description>The Halamyr are a race of insect-xenotypes living in a caste-system. On top of the caste, the queens are the centerpiece of any hive. They are the only Halamyr that can produce drones, or mass-produce workers. A hive can virtually not live without a queen - without their royalty the drones and workers are irritated and receive sever penalties. Queens are very fragile and need to be kept safe and in best conditions.</description>
-    <descriptionShort>The fragile queens of the Halamyr are the center of the hives reproduction. Multiple queens, or and absence of a queen, can cause to fall the best hive into disarray real quick.</descriptionShort>
-    
-    <genes>			
-        <li MayRequire="sarg.alphagenes" >AG_LargerBodySize</li>
-        <li MayRequire="sarg.alphagenes" >AG_InsectBlood</li>
-        <li MayRequire="sarg.alphagenes" >AG_InsectJellyProduction</li>
-        <li MayRequire="sarg.alphagenes" >AG_SurvivalInstinct_Low</li>
-        <li>WoundHealing_Slow</li>
-        <li>PsychicAbility_Extreme</li>
-        <li>MoveSpeed_Slow</li>
-        <li>FireTerror</li>
-        <li>MeleeDamage_Weak</li>
-        <li>Sleepy</li>
-        <li>Delicate</li>
-        <li>rjw_genes_hypersexual</li>
-        <li>rjw_genes_bisexual</li>
-        <li>Libido_High</li>
-        <li>Beauty_Beautiful</li>
-        <li MayRequire="sarg.alphagenes" >AG_OutwardsAntennas</li>
-        <li>Skin_DeepRed</li>
-        <li>Learning_Fast</li>
-        <li>rjw_genes_fervent_ovipositor</li>
-        <li>AptitudeTerrible_Shooting</li>
-        <li>AptitudeTerrible_Melee</li>
-        <li>AptitudeRemarkable_Social</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>
-        <li>rjw_genes_queen</li>
-        <li>rjw_genes_cocoonweaver</li>
-        <li>rjw_genes_spawn_spelopede</li>
-    </genes>
-  </XenotypeDef>
-  
-  <XenotypeDef>
-    <defName>rjw_genes_halamyr_hiveguard_xenotype</defName>
-    <label>Halamyr Hiveguard</label>
-    <iconPath>Genes/Icons/Xenotypes/Xenotype-Guard</iconPath>
-
-    <combatPowerFactor>1.5</combatPowerFactor>
-    <inheritable>false</inheritable>
-
-    <description>The Halamyr hiveguards are the bastion to protect the hive. Next to the walls, these meele specialists form the ultimate guard for the queen, for which they'd give their lifes. Their tuned bodies come with a price, crippling them for social interactions and increased hunger.</description>
-    <descriptionShort>Frontline of the Halamyr, guards of the hive, specialised in meele combat. Heavily handicapped without a queen.</descriptionShort>
-    
-    <genes>			
-        <li MayRequire="sarg.alphagenes" >AG_InsectBlood</li>
-        <li MayRequire="sarg.alphagenes" >AG_EfficientMandibles</li>
-        <li>Immunity_Strong</li>
-        <li>WoundHealing_Fast</li>
-        <li>MoveSpeed_Quick</li>
-        <li>FireTerror</li>
-        <li>MeleeDamage_Strong</li>
-        <li>KillThirst</li>
-        <li>LowSleep</li>
-        <li MayRequire="sarg.alphagenes" >AG_WaspWings</li>
-        <li>Hair_ShortOnly</li>
-        <li MayRequire="sarg.alphagenes" >AG_DownwardsAntennas</li>
-        <li>Hair_DarkBlack</li>
-        <li>Skin_DeepRed</li>
-        <li MayRequire="sarg.alphagenes" >AG_FeraliskEyes</li>
-        <li>AptitudeTerrible_Shooting</li>
-        <li>AptitudeRemarkable_Melee</li>
-        <li>AptitudePoor_Construction</li>
-        <li>AptitudePoor_Cooking</li>
-        <li>AptitudePoor_Plants</li>
-        <li>AptitudePoor_Crafting</li>
-        <li>AptitudeTerrible_Artistic</li>
-        <li>AptitudeTerrible_Medicine</li>
-        <li>AptitudePoor_Social</li>
-        <li>rjw_genes_male_only</li>
-        <li>rjw_genes_ovipositor_genitalia</li>
-        <li>rjw_genes_drone</li>
-        <li>rjw_genes_zealous_loyalty</li>
-    </genes>
-  </XenotypeDef>
-  
-  <XenotypeDef>
-    <defName>rjw_genes_halamyr_breeder_xenotype</defName>
-    <label>Halamyr Breeder</label>
-    <iconPath>Genes/Icons/Xenotypes/Xenotype-Breeder</iconPath>
-    <inheritable>false</inheritable>
-    <canGenerateAsCombatant>false</canGenerateAsCombatant>
-    <combatPowerFactor>0.8</combatPowerFactor>
-
-    <description>The Halamyr breeders are the backbone of the hive. Their special genes allow them to carry more eggs and hatch them faster, enabling a steady output of hivelings. To support their position in the hive, breeders spend most of their life in the queens cocoon, a task which they gladly accept.</description>
-    <descriptionShort>Made for incubating Halamyr eggs, breeders spend most of their life in the queens cocoon.</descriptionShort>
-
-    <genes>			
-      <li MayRequire="sarg.alphagenes" >AG_Spinnerets</li>
-			<li MayRequire="sarg.alphagenes" >AG_InsectBlood</li>
-			<li MayRequire="sarg.alphagenes" >AG_InsectJellyProduction</li>
-			<li MayRequire="sarg.alphagenes" >AG_FormicAntennas</li>
-      <li>Fertile</li>
-			<li MayRequire="sarg.alphagenes" >AG_FastGestation</li>
-			<li>FireTerror</li>
-			<li>VerySleepy</li>
-			<li>rjw_genes_bisexual</li>
-			<li>Skin_DeepRed</li>
-			<li>AptitudeStrong_Social</li>
-			<li>rjw_genes_drone</li>
-      <li>rjw_genes_female_only</li>
-			<li>rjw_genes_zealous_loyalty</li>
-			<li>rjw_genes_insectincubator</li>	
-			<li>rjw_genes_zoophile</li>	
-      <li>rjw_genes_no_vagina</li>
-    </genes>
-  </XenotypeDef>
-  
-</Defs>
--- a/Common/Defs/HediffDefs/Bioscaffold.xml
+++ b/Common/Defs/HediffDefs/Bioscaffold.xml
@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8" ?>
+
+<Defs>
+  <HediffDef>
+    <defName>Bioscaffold</defName>
+    <hediffClass>HediffWithComps</hediffClass>
+    <label>bioscaffold</label>
+    <description>This woman has an bioscaffold mesh within her womb, providing an enriching environment for an unborn baby to grow more quickly.</description>
+    <descriptionHyperlinks>
+      <ThingDef>Bioscaffold</ThingDef>
+    </descriptionHyperlinks>
+    <initialSeverity>0.001</initialSeverity>
+    <everCurableByItem>false</everCurableByItem>
+    <!-- <comps>
+      <li Class="HediffCompProperties_Disappears">
+        <showRemainingTime>true</showRemainingTime>
+        <disappearsAfterTicks>540000</disappearsAfterTicks> <!10 Days>
+      </li>
+    </comps> -->
+  </HediffDef>
+</Defs>
--- a/Common/Defs/HediffDefs/Hediffs_Evergrowth.xml
+++ b/Common/Defs/HediffDefs/Hediffs_Evergrowth.xml
@ -0,0 +1,52 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<Defs>
+
+	<HediffDef>
+		<defName>rjw_genes_evergrowth_sideeffect</defName>
+		<hediffClass>HediffWithComps</hediffClass>
+		<label>genital hybris</label>
+		<description>science has gone too far - a tool like this needs constant attention.</description>
+		<defaultLabelColor>(1,0,0.5)</defaultLabelColor>
+		<maxSeverity>1.0</maxSeverity>
+		<comps>
+			<li Class="HediffCompProperties_SeverityPerDay">
+				<severityPerDay>-0.025</severityPerDay>
+			</li>
+		</comps>
+		<stages>
+			<li>
+				<label>minor</label>
+				<statFactors>
+					<SexFrequency>3</SexFrequency>
+				</statFactors>
+			</li>
+			<li>
+				<minSeverity>0.5</minSeverity>
+				<label>moderate</label>
+				<statFactors>
+					<SexFrequency>5</SexFrequency>
+				</statFactors>
+                <capMods>
+                        <li>
+                            <capacity>Consciousness</capacity>
+                            <offset>-0.05</offset>
+                        </li>
+                        </capMods>
+			</li>
+			<li>
+				<minSeverity>0.9</minSeverity>
+				<label>strong</label>
+				<statFactors>
+					<SexFrequency>7</SexFrequency>
+				</statFactors>
+                    <capMods>
+                    <li>
+                        <capacity>Consciousness</capacity>
+                        <offset>-0.1</offset>
+                    </li>
+                    </capMods>
+			</li>
+		</stages>
+	</HediffDef>
+
+</Defs>
--- a/Common/Defs/HediffDefs/LimbicStimulator.xml
+++ b/Common/Defs/HediffDefs/LimbicStimulator.xml
@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<Defs>
+  <HediffDef>
+    <defName>LimbicStimulator</defName>
+    <hediffClass>HediffWithComps</hediffClass>
+    <label>limbic stimulator</label>
+    <labelNoun>limbic stimulator</labelNoun>
+    <description>An installed limbic stimulator.</description>
+    <descriptionHyperlinks>
+      <ThingDef>Scrambler</ThingDef>
+    </descriptionHyperlinks>
+    <defaultLabelColor>(1.0, 0.6, 0.7)</defaultLabelColor>
+    <stages>
+      <li>
+        <minSeverity>0</minSeverity>
+        <statOffsets>
+          <Vulnerability>-1.0</Vulnerability>
+          <SexFrequency>6.0</SexFrequency>
+        </statOffsets>
+      </li>
+    </stages>
+  </HediffDef>
+</Defs>
--- a/Common/Defs/HediffDefs/OvaryAgitator.xml
+++ b/Common/Defs/HediffDefs/OvaryAgitator.xml
@ -0,0 +1,119 @@
+<?xml version="1.0" encoding="utf-8" ?>
+
+<Defs>
+  <HediffDef>
+    <defName>OvaryAgitator</defName>
+    <label>ovary agitator</label>
+    <description>An installed ovary agitator.</description>
+    <descriptionHyperlinks>
+      <ThingDef>OvaryAgitator</ThingDef>
+    </descriptionHyperlinks>
+    <hediffClass>HediffWithComps</hediffClass>
+    <initialSeverity>0.0001</initialSeverity>
+    <stages>
+      <li>
+        <capMods>
+          <li>
+            <capacity>RJW_Fertility</capacity>
+            <offset>0.50</offset>
+          </li>
+        </capMods>
+      </li>
+      <li>
+        <minSeverity>0.1</minSeverity>
+        <capMods>
+          <li>
+            <capacity>RJW_Fertility</capacity>
+            <offset>0.22</offset>
+          </li>
+        </capMods>
+      </li>
+      <li>
+        <minSeverity>0.2</minSeverity>
+        <capMods>
+          <li>
+            <capacity>RJW_Fertility</capacity>
+            <offset>0</offset>
+          </li>
+        </capMods>
+      </li>
+      <li>
+        <minSeverity>0.3</minSeverity>
+        <capMods>
+          <li>
+            <capacity>RJW_Fertility</capacity>
+            <offset>-0.17</offset>
+          </li>
+        </capMods>
+      </li>
+      <li>
+        <minSeverity>0.4</minSeverity>
+        <capMods>
+          <li>
+            <capacity>RJW_Fertility</capacity>
+            <offset>-0.32</offset>
+          </li>
+        </capMods>
+      </li>
+      <li>
+        <minSeverity>0.5</minSeverity>
+        <capMods>
+          <li>
+            <capacity>RJW_Fertility</capacity>
+            <offset>-0.48</offset>
+          </li>
+        </capMods>
+      </li>
+      <li>
+        <minSeverity>0.6</minSeverity>
+        <capMods>
+          <li>
+            <capacity>RJW_Fertility</capacity>
+            <offset>-0.54</offset>
+          </li>
+        </capMods>
+      </li>
+      <li>
+        <minSeverity>0.7</minSeverity>
+        <capMods>
+          <li>
+            <capacity>RJW_Fertility</capacity>
+            <offset>-0.63</offset>
+          </li>
+        </capMods>
+      </li>
+      <li>
+        <minSeverity>0.8</minSeverity>
+        <capMods>
+          <li>
+            <capacity>RJW_Fertility</capacity>
+            <offset>-0.69</offset>
+          </li>
+        </capMods>
+      </li>
+      <li>
+        <minSeverity>0.9</minSeverity>
+        <capMods>
+          <li>
+            <capacity>RJW_Fertility</capacity>
+            <offset>-0.75</offset>
+          </li>
+        </capMods>
+      </li>
+      <li>
+        <minSeverity>1</minSeverity>
+        <capMods>
+          <li>
+            <capacity>RJW_Fertility</capacity>
+            <offset>-100</offset>
+          </li>
+        </capMods>
+      </li>
+    </stages>
+    <comps>
+      <li Class="HediffCompProperties_SeverityPerDay">
+        <severityPerDay>0.0045</severityPerDay>
+      </li>
+    </comps>
+  </HediffDef>
+</Defs>
--- a/Common/Defs/HediffDefs/Scrambler.xml
+++ b/Common/Defs/HediffDefs/Scrambler.xml
@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<Defs>
+  <HediffDef>
+    <defName>Scrambler</defName>
+    <label>scrambler</label>
+    <labelNoun>scrambler</labelNoun>
+    <description>An installed scrambler.</description>
+    <descriptionHyperlinks>
+      <ThingDef>Scrambler</ThingDef>
+    </descriptionHyperlinks>
+    <defaultLabelColor>(0.9, 0.5, 1.0)</defaultLabelColor>
+    <stages>
+      <li>
+        <minSeverity>0</minSeverity>
+        <statOffsets>
+          <SlaveSuppressionOffset>0.40</SlaveSuppressionOffset>
+          <Vulnerability>3.0</Vulnerability>
+        </statOffsets>
+        <capMods>
+          <li>
+            <capacity>Consciousness</capacity>
+            <setMax>0.6</setMax>
+          </li>
+          <li>
+            <capacity>Talking</capacity>
+            <setMax>0.2</setMax>
+          </li>
+        </capMods>
+      </li>
+    </stages>
+  </HediffDef>
+</Defs>
--- a/Common/Defs/HiveOffspringChanceDef/HiveOffspringChanceDefs.xml
+++ b/Common/Defs/HiveOffspringChanceDef/HiveOffspringChanceDefs.xml
@ -1,36 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Defs>
-
-    <!-- 
-        For writing your own: 
-        1. specify your queenXenotype with an exactly matching name 
-        2. defName is not important
-        3. queen + drone + worker == 1
-
-        Otherwise, it should default to the ones specified for rjw_genes_default_hive_offspring_chances
-    -->
-
-	<RJW_Genes.HiveOffspringChanceDef>
-        <!-- Important: this default defName cannot be renamed! It is a protected keyword.-->
-        <!-- Changing the queenXenotype-Name will also throw an error.-->
-        <!-- But you can change the workerGenes list.-->
-		<defName>rjw_genes_default_hive_offspring_chances</defName>
-        <queenXenotype>default</queenXenotype>
-
-        <queenChance>0.02</queenChance>
-        <droneChance>0.48</droneChance>
-        <workerChance>0.5</workerChance>
-
-	</RJW_Genes.HiveOffspringChanceDef>
-
-	<RJW_Genes.HiveOffspringChanceDef>
-        <defName>rjw_genes_test_queen_offspring_chances</defName>
-        <queenXenotype>rjw_genes_test_queen_xenotype</queenXenotype>
-
-        <queenChance>0.02</queenChance>
-        <droneChance>0.28</droneChance>
-        <workerChance>0.7</workerChance>
-
-	</RJW_Genes.HiveOffspringChanceDef>
-	
-</Defs>
--- a/Common/Defs/LetterDefs/AnotherBaby.xml
+++ b/Common/Defs/LetterDefs/AnotherBaby.xml
@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<Defs>
+  <LetterDef Name="AnotherBaby">
+    <defName>AnotherBaby</defName>
+    <color>(120, 176, 216)</color>
+    <flashColor>(106, 179, 231)</flashColor>
+    <flashInterval>40</flashInterval>
+    <arriveSound>LetterArrive_Good</arriveSound>
+    <pauseMode>MajorThreat</pauseMode>
+  </LetterDef>
+</Defs>
--- a/Common/Defs/QueenWorkerMappingDefs/QueenWorkerMappingDefs_base.xml
+++ b/Common/Defs/QueenWorkerMappingDefs/QueenWorkerMappingDefs_base.xml
@ -1,43 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Defs>
-
-	<RJW_Genes.QueenWorkerMappingDef>
-        <!-- Important: this default defName cannot be renamed! It is a protected keyword.-->
-        <!-- Changing the queenXenotype-Name will also throw an error.-->
-        <!-- But you can change the workerGenes list.-->
-		<defName>rjw_genes_default_worker_genes</defName>
-        <queenXenotype>default</queenXenotype>
-		<workerGenes>
-			<li>StrongStomach</li>
-			<li MayRequire="sarg.alphagenes" >AG_FasterAging</li>
-			<li>PsychicAbility_Dull</li>
-			<li>FireTerror</li>
-			<li>Sterile</li>
-			<li>AptitudeTerrible_Intellectual</li>
-			<li>rjw_genes_featureless_chest</li>
-			<li>rjw_genes_worker</li>
-			<li>rjw_genes_zealous_loyalty</li>	
-		</workerGenes>
-	</RJW_Genes.QueenWorkerMappingDef>
-
-	<RJW_Genes.QueenWorkerMappingDef>
-        <defName>rjw_genes_halamyr_queen_worker_mapping</defName>
-        <queenXenotype>rjw_genes_halamyr_queen_xenotype</queenXenotype>
-		<workerGenes>
-			<li MayRequire="sarg.alphagenes" >AG_SmallerBodySize</li>
-			<li>StrongStomach</li>
-			<li MayRequire="sarg.alphagenes" >AG_EfficientMandibles</li>
-			<li MayRequire="sarg.alphagenes" >AG_FasterAging</li>
-			<li>PsychicAbility_Dull</li>
-			<li>FireTerror</li>
-			<li>Sterile</li>
-			<li MayRequire="sarg.alphagenes" >AG_FormicAntennas</li>
-			<li>Skin_DeepRed</li>
-			<li>AptitudeTerrible_Intellectual</li>
-			<li>rjw_genes_featureless_chest</li>
-			<li>rjw_genes_worker</li>
-			<li>rjw_genes_zealous_loyalty</li>
-		</workerGenes>
-	</RJW_Genes.QueenWorkerMappingDef>
-	
-</Defs>
--- a/Common/Defs/RecipeDefs/Bioscaffold.xml
+++ b/Common/Defs/RecipeDefs/Bioscaffold.xml
@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="utf-8" ?>
+
+<Defs>
+  <RecipeDef ParentName="SurgeryInstallImplantBase">
+    <defName>InstallBioscaffold</defName>
+    <label>install bioscaffold</label>
+    <description>Install a bioscaffold.</description>
+    <descriptionHyperlinks>
+      <ThingDef>Bioscaffold</ThingDef>
+      <HediffDef>Bioscaffold</HediffDef>
+    </descriptionHyperlinks>
+    <jobString>Installing bioscaffold.</jobString>
+    <ingredients>
+      <li>
+        <filter>
+          <thingDefs>
+            <li>Bioscaffold</li>
+          </thingDefs>
+        </filter>
+        <count>1</count>
+      </li>
+    </ingredients>
+    <fixedIngredientFilter>
+      <thingDefs>
+        <li>Bioscaffold</li>
+      </thingDefs>
+    </fixedIngredientFilter>
+    <appliedOnFixedBodyParts>
+      <li>Torso</li>
+    </appliedOnFixedBodyParts>
+    <addsHediff>Bioscaffold</addsHediff>
+  </RecipeDef>
+</Defs>
--- a/Common/Defs/RecipeDefs/LimbicStimulator.xml
+++ b/Common/Defs/RecipeDefs/LimbicStimulator.xml
@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="utf-8" ?>
+
+<Defs>
+  <RecipeDef ParentName="SurgeryInstallImplantBase">
+    <defName>InstallLimbicStimulator</defName>
+    <label>install limbic stimulator</label>
+    <description>Install a limbic stimulator.</description>
+    <descriptionHyperlinks>
+      <ThingDef>LimbicStimulator</ThingDef>
+      <HediffDef>LimbicStimulator</HediffDef>
+    </descriptionHyperlinks>
+    <jobString>Installing limbic stimulator.</jobString>
+    <ingredients>
+      <li>
+        <filter>
+          <thingDefs>
+            <li>LimbicStimulator</li>
+          </thingDefs>
+        </filter>
+        <count>1</count>
+      </li>
+    </ingredients>
+    <fixedIngredientFilter>
+      <thingDefs>
+        <li>LimbicStimulator</li>
+      </thingDefs>
+    </fixedIngredientFilter>
+    <appliedOnFixedBodyParts>
+      <li>Brain</li>
+    </appliedOnFixedBodyParts>
+    <addsHediff>LimbicStimulator</addsHediff>
+  </RecipeDef>
+</Defs>
--- a/Common/Defs/RecipeDefs/OvaryAgitator.xml
+++ b/Common/Defs/RecipeDefs/OvaryAgitator.xml
@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="utf-8" ?>
+
+<Defs>
+  <RecipeDef ParentName="SurgeryInstallImplantBase">
+    <defName>InstallOvaryAgitator</defName>
+    <label>install ovary agitator</label>
+    <description>Install an ovary agitator.</description>
+    <descriptionHyperlinks>
+      <ThingDef>OvaryAgitator</ThingDef>
+      <HediffDef>OvaryAgitator</HediffDef>
+    </descriptionHyperlinks>
+    <workerClass>Recipe_InstallImplant</workerClass>
+    <jobString>Installing ovary agitator.</jobString>
+    <isViolation>true</isViolation>
+    <ingredients>
+      <li>
+        <filter>
+          <thingDefs>
+            <li>OvaryAgitator</li>
+          </thingDefs>
+        </filter>
+        <count>1</count>
+      </li>
+    </ingredients>
+    <fixedIngredientFilter>
+      <thingDefs>
+        <li>OvaryAgitator</li>
+      </thingDefs>
+    </fixedIngredientFilter>
+    <appliedOnFixedBodyParts>
+      <li>Torso</li>
+    </appliedOnFixedBodyParts>
+    <addsHediff>OvaryAgitator</addsHediff>
+  </RecipeDef>
+</Defs>
--- a/Common/Defs/RecipeDefs/Scrambler.xml
+++ b/Common/Defs/RecipeDefs/Scrambler.xml
@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="utf-8" ?>
+
+<Defs>
+  <RecipeDef ParentName="SurgeryInstallImplantBase">
+    <defName>InstallScrambler</defName>
+    <label>install scrambler</label>
+    <description>Install a scrambler.</description>
+    <descriptionHyperlinks>
+      <ThingDef>Scrambler</ThingDef>
+      <HediffDef>Scrambler</HediffDef>
+    </descriptionHyperlinks>
+    <workerClass>Recipe_InstallImplant</workerClass>
+    <jobString>Installing scrambler.</jobString>
+    <isViolation>true</isViolation>
+    <ingredients>
+      <li>
+        <filter>
+          <thingDefs>
+            <li>Scrambler</li>
+          </thingDefs>
+        </filter>
+        <count>1</count>
+      </li>
+    </ingredients>
+    <fixedIngredientFilter>
+      <thingDefs>
+        <li>Scrambler</li>
+      </thingDefs>
+    </fixedIngredientFilter>
+    <appliedOnFixedBodyParts>
+      <li>Brain</li>
+    </appliedOnFixedBodyParts>
+    <addsHediff>Scrambler</addsHediff>
+  </RecipeDef>
+</Defs>
--- a/Common/Defs/Scenarios/Halamyr_Hive.xml
+++ b/Common/Defs/Scenarios/Halamyr_Hive.xml
@ -1,158 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<Defs>
-
-  <ScenarioDef>
-    <defName>rjw_genes_scenario_halamyr_hive</defName>
-    <label>Halamyr Hive</label>
-    <description>A young queen set out to build a new hive. After a long path, a suitable place is found to generate new offspring. DEVNOTE: Try to choose a high-food biome to keep up with the Hive!</description>
-    <scenario>
-      <summary>A Halamyr queen set out to build a new hive.</summary>
-      <playerFaction>
-        <def>PlayerFaction</def>
-        <factionDef>PlayerTribe</factionDef>
-      </playerFaction>
-      <parts>
-
-
-        <!-- Config pages -->
-        <li Class="ScenPart_ConfigPage_ConfigureStartingPawns_Xenotypes">
-          <def>ConfigurePawnsXenotypes</def>
-          <pawnChoiceCount>4</pawnChoiceCount>
-          <customSummary>Start with a set of Halamyr Xenotypes and one other colonist of any age.</customSummary>
-
-          <xenotypeCounts>
-            <li>
-              <xenotype>rjw_genes_halamyr_queen_xenotype</xenotype>
-              <count>1</count>
-              <description>non-baby halamyr queen</description>
-              <requiredAtStart>true</requiredAtStart>
-              <allowedDevelopmentalStages>Adult</allowedDevelopmentalStages>
-            </li>
-
-            <li>
-              <xenotype>rjw_genes_halamyr_hiveguard_xenotype</xenotype>
-              <count>1</count>
-              <description>non-baby halamyr hiveguard</description>
-              <requiredAtStart>true</requiredAtStart>
-              <allowedDevelopmentalStages>Adult</allowedDevelopmentalStages>
-            </li>
-
-            <li>
-              <xenotype>rjw_genes_halamyr_breeder_xenotype</xenotype>
-              <count>1</count>
-              <description>adulthalamyr breeder</description>
-              <requiredAtStart>true</requiredAtStart>
-              <allowedDevelopmentalStages>Adult</allowedDevelopmentalStages>
-            </li>
-
-            <li>
-              <xenotype>Baseliner</xenotype>
-              <count>2</count>
-            </li>
-          </xenotypeCounts>
-        </li>
-
-        <!-- Player starting stuff spawn method-->
-        <li Class="ScenPart_PlayerPawnsArriveMethod">
-          <def>PlayerPawnsArriveMethod</def>
-          <method>Standing</method>
-        </li>
-
-        <!-- Player pawns modifiers -->
-        <li Class="ScenPart_ForcedHediff">
-          <def>ForcedHediff</def>
-          <visible>false</visible>
-          <context>PlayerStarter</context>
-          <chance>0.5</chance>
-          <hediff>Malnutrition</hediff>
-          <severityRange>0.1~0.2</severityRange>
-        </li>
-        <li Class="ScenPart_SetNeedLevel">
-          <def>SetNeedLevel</def>
-          <visible>false</visible>
-          <context>PlayerStarter</context>
-          <chance>1.0</chance>
-          <need>Food</need>
-          <levelRange>0.3~0.8</levelRange>
-        </li>
-
-        <!-- Player starting things -->
-        <li Class="ScenPart_StartingThing_Defined">
-          <def>StartingThing_Defined</def>
-          <thingDef>Silver</thingDef>
-          <count>300</count>
-        </li>
-        <li Class="ScenPart_StartingThing_Defined">
-          <def>StartingThing_Defined</def>
-          <thingDef>Pemmican</thingDef>
-          <count>350</count>
-        </li>
-        <li Class="ScenPart_StartingThing_Defined">
-          <def>StartingThing_Defined</def>
-          <thingDef>InsectJelly</thingDef>
-          <count>300</count>
-        </li>
-        <li Class="ScenPart_StartingThing_Defined">
-          <def>StartingThing_Defined</def>
-          <thingDef>MedicineHerbal</thingDef>
-          <count>30</count>
-        </li>
-        <li Class="ScenPart_StartingThing_Defined">
-          <def>StartingThing_Defined</def>
-          <thingDef>MeleeWeapon_Club</thingDef>
-          <stuff>WoodLog</stuff>
-        </li>
-
-        <li Class="ScenPart_StartingAnimal">
-          <def>StartingAnimal</def>
-          <animalKind>Spelopede</animalKind>
-          <count>2</count>
-        </li>
-        <li Class="ScenPart_StartingAnimal">
-          <def>StartingAnimal</def>
-          <animalKind>Megascarab</animalKind>
-          <count>3</count>
-          <bondToRandomPlayerPawnChance>1.0</bondToRandomPlayerPawnChance>
-        </li>
-
-        <li Class="ScenPart_StartingAnimal">
-          <def>StartingAnimal</def>
-          <animalKind>Megaspider</animalKind>
-          <count>1</count>
-        </li>
-
-        <!-- Scatter some things near player start -->
-        <li Class="ScenPart_ScatterThingsNearPlayerStart">
-          <def>ScatterThingsNearPlayerStart</def>
-          <thingDef>WoodLog</thingDef>
-          <count>500</count>
-        </li>
-        <li Class="ScenPart_ScatterThingsNearPlayerStart">
-          <def>ScatterThingsNearPlayerStart</def>
-          <thingDef>Jade</thingDef>
-          <count>100</count>
-        </li>
-        
-        <li Class="ScenPart_ScatterThingsNearPlayerStart">
-          <def>ScatterThingsNearPlayerStart</def>
-          <thingDef>Pemmican</thingDef>
-          <count>150</count>
-        </li>
-        <li Class="ScenPart_ScatterThingsNearPlayerStart">
-          <def>ScatterThingsNearPlayerStart</def>
-          <thingDef>Steel</thingDef>
-          <count>200</count>
-        </li>
-
-        <!-- Game start dialog -->
-        <li Class="ScenPart_GameStartDialog">
-          <def>GameStartDialog</def>
-          <text>After a long journey, this is it: \n\nThis is the right place to start the new hive. Spin in your breeders, build your defenses and start mating.\n\nMake this a place worthy for a queen.</text>
-          <closeSound>GameStartSting</closeSound>
-        </li>
-
-      </parts>
-    </scenario>
-  </ScenarioDef>
-
-</Defs>
--- a/Common/Defs/ThingDefs/Bioscaffold.xml
+++ b/Common/Defs/ThingDefs/Bioscaffold.xml
@ -0,0 +1,53 @@
+<?xml version="1.0" encoding="utf-8" ?>
+
+<Defs>  
+  <ThingDef ParentName="BodyPartNaturalBase">
+    <defName>Bioscaffold</defName>
+    <label>bioscaffold</label>
+    <description>A single-use nanite-constructed lattice of organic mesh material meant to be installed inside a woman's womb prior to pregnancy. It provides an enriching environment for an unborn baby to grow more quickly.</description>
+    <descriptionHyperlinks>
+      <RecipeDef>InstallBioscaffold</RecipeDef>
+    </descriptionHyperlinks>
+    <techLevel>Spacer</techLevel>
+    <tickerType>Rare</tickerType>
+    <drawGUIOverlay>true</drawGUIOverlay>
+    <stackLimit>25</stackLimit>
+    <healthAffectsPrice>false</healthAffectsPrice>
+    <statBases>
+      <MaxHitPoints>30</MaxHitPoints>
+      <MarketValue>350</MarketValue>
+      <Mass>0.15</Mass>
+      <Flammability>1.3</Flammability>
+      <DeteriorationRate>6</DeteriorationRate>
+      <WorkToMake>800</WorkToMake>
+    </statBases>
+    <comps>
+      <li Class="CompProperties_Rottable">
+        <daysToRotStart>5</daysToRotStart>
+        <rotDestroys>true</rotDestroys>
+      </li>
+    </comps>
+    <costList>
+      <Plasteel>5</Plasteel>
+      <BabyFood>10</BabyFood>
+      <MedicineUltratech>1</MedicineUltratech>
+      <ComponentSpacer>1</ComponentSpacer>
+    </costList>
+    <recipeMaker>
+      <workSpeedStat>DrugSynthesisSpeed</workSpeedStat>
+      <workSkill>Intellectual</workSkill>
+      <recipeUsers>
+        <li>DrugLab</li>
+      </recipeUsers>
+      <skillRequirements>
+        <Crafting>6</Crafting>
+        <Intellectual>4</Intellectual>
+      </skillRequirements> 
+      <researchPrerequisite>FertilityProcedures</researchPrerequisite>
+      <bulkRecipeCount>4</bulkRecipeCount>
+    </recipeMaker>
+    <tradeTags>
+      <li>ExoticMisc</li>
+    </tradeTags>
+  </ThingDef>
+</Defs>
--- a/Common/Defs/ThingDefs/LimbicStimulator.xml
+++ b/Common/Defs/ThingDefs/LimbicStimulator.xml
@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="utf-8" ?>
+
+<Defs>  
+  <ThingDef ParentName="BodyPartProstheticImperialBase">
+    <defName>LimbicStimulator</defName>
+    <label>limbic stimulator</label>
+    <description>A perpetual slow-release chemical stimulation implant that is embedded deep within the reward center of the brain, greatly increasing the need for lovin'. The need is said to become so strong that it can drive people to force themselves onto others, even if they wouldn't otherwise. Post-lovin' clarity will leave the implanted in a state of bliss, but they may also feel a sense of regret if they steal lovin' if they normally wouldn't - at least until they become used to doing it.</description>
+    <descriptionHyperlinks>
+      <RecipeDef>InstallLimbicStimulator</RecipeDef>
+    </descriptionHyperlinks>
+    <costList>
+      <Steel>30</Steel>
+      <ComponentIndustrial>4</ComponentIndustrial>
+      <ComponentSpacer>1</ComponentSpacer>
+    </costList>
+    <recipeMaker>
+      <researchPrerequisite>BrainWiring</researchPrerequisite>
+    </recipeMaker>
+  </ThingDef>
+</Defs>
--- a/Common/Defs/ThingDefs/OvaryAgitator.xml
+++ b/Common/Defs/ThingDefs/OvaryAgitator.xml
@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="utf-8" ?>
+
+<Defs>  
+  <ThingDef ParentName="BodyPartBionicBase">
+    <defName>OvaryAgitator</defName>
+    <label>ovary agitator</label>
+    <description>A crude slaver implant used to increase the number of eggs released during ovulation, increasing the likelihood of having multiple children per pregnancy. Their use is largely limited to rimworlds lacking in cloning infrastructure as most civilized and unified worlds have outlawed them.\n\nWhile it provides an initial boost in fertility, the implant will slowly deplete the victims's ovaries over several years until they're infertile. Allies of implanted victims will be angered.</description>
+    <descriptionHyperlinks>
+      <RecipeDef>InstallOvaryAgitator</RecipeDef>
+    </descriptionHyperlinks>
+    <costList>
+      <Plasteel>10</Plasteel>
+      <MedicineIndustrial>1</MedicineIndustrial>
+      <ComponentIndustrial>6</ComponentIndustrial>
+    </costList>
+    <recipeMaker>
+      <researchPrerequisite>FertilityProcedures</researchPrerequisite>
+    </recipeMaker>
+  </ThingDef>
+</Defs>
--- a/Common/Defs/ThingDefs/Scrambler.xml
+++ b/Common/Defs/ThingDefs/Scrambler.xml
@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8" ?>
+
+<Defs>  
+  <ThingDef ParentName="BodyPartProstheticImperialBase">
+    <defName>Scrambler</defName>
+    <label>scrambler</label>
+    <description>A slaver implant, made from a modified mindscrew, that can inject disorienting mind imagery directly into the visual cortex of the brain through a complex network of nanoelectrodes. Victims of scrambler implantation tend to socially withdraw to minimize additional stimulation. As a consequence of their confusion, they also become physically meek, making them easy to impose upon. Allies of implanted victims will be angered.</description>
+    <descriptionHyperlinks><RecipeDef>InstallScrambler</RecipeDef></descriptionHyperlinks>
+    <statBases>
+      <WorkToMake>50</WorkToMake>
+    </statBases>
+    <costList>
+      <Mindscrew>1</Mindscrew>
+      <ComponentIndustrial>1</ComponentIndustrial>
+      <ComponentSpacer>1</ComponentSpacer>
+    </costList>
+    <recipeMaker>
+      <researchPrerequisite>BrainWiring</researchPrerequisite>
+    </recipeMaker>
+  </ThingDef>
+</Defs>
--- a/Common/Defs/ThoughtDefs/Thoughts_Hive.xml
+++ b/Common/Defs/ThoughtDefs/Thoughts_Hive.xml
@ -1,102 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-
-<Defs>
-
-	<ThoughtDef>
-		<!-- For Challenged Queens -->
-		<defName>rjw_genes_rival_queen_mood</defName>
-		<workerClass>RJW_Genes.Thoughtworker_RivalQueen_Mood</workerClass>
-		<validWhileDespawned>false</validWhileDespawned>
-		<stages>
-			<li>
-				<label>Rivaled</label>
-				<description>There is another queen nearby!</description>
-				<baseMoodEffect>-70</baseMoodEffect>
-			</li>
-		</stages>
-	</ThoughtDef>
-
-	<ThoughtDef>
-		<!-- For Challenged Queens -->
-		<defName>rjw_genes_rival_queen_social</defName>
-		<thoughtClass>Thought_SituationalSocial</thoughtClass>
-		<workerClass>RJW_Genes.Thoughtworker_RivalQueen_Social</workerClass>
-		<stages>
-			<li>
-				<label>rivals me</label>
-				<description>{0} threatens my dominion. {0} must be perished.</description>
-				<baseOpinionOffset>-130</baseOpinionOffset>
-			</li>
-		</stages>
-	</ThoughtDef>
-
-	<ThoughtDef>
-		<defName>rjw_genes_queen_despises_workers_social</defName>
-		<thoughtClass>Thought_SituationalSocial</thoughtClass>
-		<workerClass>RJW_Genes.ThoughtWorker_WorkerDespised_Social</workerClass>
-		<stages>
-			<li>
-				<label>underling</label>
-				<description>those workers are not even worth a glance.</description>
-				<baseOpinionOffset>-20</baseOpinionOffset>
-			</li>
-		</stages>
-	</ThoughtDef>
-
-	<ThoughtDef>
-		<!-- For Loyal Pawns -->
-		<defName>rjw_genes_multiple_queens_mood</defName>
-		<workerClass>RJW_Genes.Thoughtworker_MultipleQueens_Mood</workerClass>
-		<validWhileDespawned>false</validWhileDespawned>
-		<stages>
-			<li>
-				<label>Confused Servitude</label>
-				<description>I have too many queens around me!</description>
-				<baseMoodEffect>-30</baseMoodEffect>
-			</li>
-		</stages>
-	</ThoughtDef>
-
-	<ThoughtDef>
-		<!-- For Loyal Pawns -->
-		<defName>rjw_genes_queen_loyalty_social</defName>
-		<thoughtClass>Thought_SituationalSocial</thoughtClass>
-		<workerClass>RJW_Genes.Thoughtworker_QueenPresent_Social</workerClass>
-		<stages>
-			<li>
-				<label>Worship</label>
-				<description>{0} is my queen. My one and only reason to live.</description>
-				<baseOpinionOffset>+80</baseOpinionOffset>
-			</li>
-		</stages>
-	</ThoughtDef>
-
-	<ThoughtDef>
-		<!-- For Loyal Pawns -->
-		<defName>rjw_genes_no_queen_mood</defName>
-		<workerClass>RJW_Genes.Thoughtworker_QueenAbsent_Mood</workerClass>
-		<validWhileDespawned>false</validWhileDespawned>
-		<stages>
-			<li>
-				<label>Missing Queen</label>
-				<description>We do not have a queen! How are we suppossed to face the cruelties of the world without a shepherd?</description>
-				<baseMoodEffect>-20</baseMoodEffect>
-			</li>
-		</stages>
-	</ThoughtDef>
-
-	<ThoughtDef>
-		<!-- For Loyal Pawns -->
-		<defName>rjw_genes_queen_present_mood</defName>
-		<workerClass>RJW_Genes.Thoughtworker_QueenPresent_Mood</workerClass>
-		<validWhileDespawned>false</validWhileDespawned>
-		<stages>
-			<li>
-				<label>Queen Present</label>
-				<description>Our queen is so wonderful.</description>
-				<baseMoodEffect>+10</baseMoodEffect>
-			</li>
-		</stages>
-	</ThoughtDef>
-
-</Defs>
--- a/Common/Defs/ThoughtDefs/Thoughts_Memories.xml
+++ b/Common/Defs/ThoughtDefs/Thoughts_Memories.xml
@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8" ?>
+
+<Defs>
+  <ThoughtDef>
+		<defName>RegretsStealingLovin</defName>
+		<thoughtClass>Thought_Memory</thoughtClass>
+		<durationDays>1.5</durationDays>
+		<stackLimit>3</stackLimit>
+		<stackedEffectMultiplier>0.4</stackedEffectMultiplier>
+		<stages>
+			<li>
+				<label>regrets stealing some lovin'</label>
+				<description>I don't remember how or why, but I violated someone. It felt good in the moment, but it felt so wrong afterward. My cravings from my implant are just too strong!</description>
+				<baseMoodEffect>-5</baseMoodEffect>
+			</li>
+		</stages>
+	</ThoughtDef>
+</Defs>
--- a/Common/Defs/ThoughtDefs/Thoughts_Special.xml
+++ b/Common/Defs/ThoughtDefs/Thoughts_Special.xml
@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8" ?>
+
+<Defs>
+
+	<ThoughtDef>
+		<defName>rjw_genes_pheromone_carrier_nearby</defName>
+		<thoughtClass>Thought_SituationalSocial</thoughtClass>
+		<workerClass>RJW_Genes.ThoughtWorker_Aphrodisiac_Pheromones_Social</workerClass>
+		<stages>
+			<li>
+				<label>Pheromones</label>
+				<description>{0} has a special vibe, we should hang out more often.</description>
+				<baseOpinionOffset>+3</baseOpinionOffset>
+			</li>
+		</stages>
+	</ThoughtDef>
+
+</Defs>
--- a/Common/Languages/English/Keyed/Dialog_StatsReport.xml
+++ b/Common/Languages/English/Keyed/Dialog_StatsReport.xml
@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-
-<LanguageData>
-
-  <StatsReport_QueenCloseBy>queen in proximity</StatsReport_QueenCloseBy>
-  <StatsReport_QueenAbsent>queen absent</StatsReport_QueenAbsent>
-  <StatsReport_MultipleQueens>multiple queens present</StatsReport_MultipleQueens>
-
-</LanguageData>
--- a/Common/Languages/English/Keyed/Lifeforce.xml
+++ b/Common/Languages/English/Keyed/Lifeforce.xml
@ -14,4 +14,7 @@
 	
 	<rjw_genes_sexdemon_visit_incident_label>Dirty dreams</rjw_genes_sexdemon_visit_incident_label>
 	<rjw_genes_sexdemon_visit_incident_description>The dirty dreams of your colonists have attracted succubi.\n\nThey will hang around for a couple of days trying to seduce your colonists. They may decide to join your colony, if they are impressed by your colonists's sexual prowess.</rjw_genes_sexdemon_visit_incident_description>
+
+	<rjw_genes_succubus_joins_letter_label>Guest Joins</rjw_genes_succubus_joins_letter_label>
+	<rjw_genes_succubus_joins_letter_description>{0} enjoys it here and has decided to stay.</rjw_genes_succubus_joins_letter_description>
 </LanguageData>
--- a/Common/Patches/Genes/Patch_Highmates.xml
+++ b/Common/Patches/Genes/Patch_Highmates.xml
@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<Patch>
+	<Operation Class="PatchOperationFindMod">
+		<mods>
+			<li>Vanilla Races Expanded - Highmate</li>
+		</mods>
+		<match Class="PatchOperationReplace">
+			<xpath>/Defs/AbilityDef[defName="VRE_InitiateLovin"]/comps</xpath>
+			<value>
+				<comps>
+					<li Class = "RJW_Genes.CompProperties_Seduce">
+						<compClass>RJW_Genes.CompAbilityEffect_Seduce</compClass>
+						<destination>Caster</destination>
+					</li>
+				</comps>
+			</value>
+		</match>
+	</Operation>
+</Patch>
+
--- a/Common/Patches/ThingDefs/RJW_Used_Condoms.xml
+++ b/Common/Patches/ThingDefs/RJW_Used_Condoms.xml
@ -1,11 +1,19 @@
 <?xml version="1.0" encoding="utf-8" ?>
 <Patch>
-	<!-- Add RJW Sex meditation focus icon to VanillaPsycastsExpanded -->
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>RimJobWorld</li>
-		</mods>
-		<match Class="PatchOperationAdd">
+	<!-- 
+		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
+		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
+		Please if you write mods, do not just purge out XMLs. Thanks. 
+
+		This patch was kindly provided by Infi over Discord. 
+	-->
+
+	<Operation Class="PatchOperationConditional">
+		<xpath>Defs/ThingDef[defName="UsedCondom"]/ingestible/outcomeDoers</xpath>
+		<nomatch Class="PatchOperationAdd">
 			<xpath>/Defs/ThingDef[defName="UsedCondom"]/ingestible</xpath>
 			<value>
 				<outcomeDoers>
@ -14,6 +22,15 @@
 					</li>
 				</outcomeDoers>
 			</value>
+		</nomatch>
+		<match Class="PatchOperationAdd">
+			<xpath>Defs/ThingDef[defName="UsedCondom"]/ingestible/outcomeDoers</xpath>
+			<value>
+				<li Class="RJW_Genes.IngestionOutcomeDoer_LifeForceOffset">
+						<FertilinPerUnit>1</FertilinPerUnit>
+					</li>
+			</value>
 		</match>
 	</Operation>
+	
 </Patch>
--- a/Common/Patches/ThingDefs/Sexperience_Cum.xml
+++ b/Common/Patches/ThingDefs/Sexperience_Cum.xml
@ -1,17 +1,42 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Patch>
-	<!-- Add RJW Sex meditation focus icon to VanillaPsycastsExpanded -->
+
+	<!-- 
+		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
+		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
+		Please if you write mods, do not just purge out XMLs. Thanks. 
+
+		This patch was kindly mirrored after Infis Patch of UsedCondoms. 
+	-->
 	<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>
+				<xpath>Defs/ThingDef[defName="GatheredCum"]/ingestible/outcomeDoers</xpath>
 				<value>
 					<li Class="RJW_Genes.IngestionOutcomeDoer_LifeForceOffset">
 						<FertilinPerUnit>1</FertilinPerUnit>
 					</li>
 				</value>
 			</match>
+		</match>
 	</Operation>
+
 </Patch>
--- a/Common/Patches/Xenotypes/GenitaliaUpdate.xml
+++ b/Common/Patches/Xenotypes/GenitaliaUpdate.xml
@ -17,13 +17,6 @@
 		</value>
 	</Operation>

-	<Operation Class="PatchOperationAdd">
-		<xpath>Defs/XenotypeDef[defName="Waster"]/genes</xpath>
-		<value>
-			<li>rjw_genes_insectbreeder</li>
-		</value>
-	</Operation>
-    
 	<Operation Class="PatchOperationAdd">
 		<xpath>Defs/XenotypeDef[defName="Yttakin"]/genes</xpath>
 		<value>
--- a/Common/Patches/Xenotypes/PatchAlphaGenes.xml
+++ b/Common/Patches/Xenotypes/PatchAlphaGenes.xml
@ -81,6 +81,51 @@
                    </value>
                </match>
            </li>
+
+            <li Class="PatchOperationFindMod">
+                <mods>
+                    <li>Alpha Genes</li>
+                </mods>
+                <match Class="PatchOperationAdd">
+                    <xpath>Defs/XenotypeDef[defName="AG_Drakonori"]/genes</xpath>
+                    <value>
+                        <li>rjw_genes_dragon_genitalia</li>
+                        <li>rjw_genes_big_male_genitalia</li>
+                        <li>rjw_genes_aphrodisiac_pheromones</li>
+                        <li>rjw_genes_big_breasts</li>
+                    </value>
+                </match>
+            </li>
+
+            <li Class="PatchOperationFindMod">
+                <mods>
+                    <li>Alpha Genes</li>
+                </mods>
+                <match Class="PatchOperationAdd">
+                    <xpath>Defs/XenotypeDef[defName="AG_Animusen"]/genes</xpath>
+                    <value>
+                        <li>rjw_genes_canine_genitalia</li>
+                    </value>
+                </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>
--- a/Common/Textures/Genes/Icons/Big_Breasts.dds
+++ b/Common/Textures/Genes/Icons/Big_Breasts.dds
--- a/Common/Textures/Genes/Icons/Big_Breasts.png
+++ b/Common/Textures/Genes/Icons/Big_Breasts.png
--- a/Common/Textures/Genes/Icons/Big_Male_Genitalia.dds
+++ b/Common/Textures/Genes/Icons/Big_Male_Genitalia.dds
--- a/Common/Textures/Genes/Icons/Big_Male_Genitalia.png
+++ b/Common/Textures/Genes/Icons/Big_Male_Genitalia.png
--- a/Common/Textures/Genes/Icons/Cocoon.dds
+++ b/Common/Textures/Genes/Icons/Cocoon.dds
--- a/Common/Textures/Genes/Icons/Cum-Base.dds
+++ b/Common/Textures/Genes/Icons/Cum-Base.dds
--- a/Common/Textures/Genes/Icons/Cumflation.dds
+++ b/Common/Textures/Genes/Icons/Cumflation.dds
--- a/Common/Textures/Genes/Icons/Cumflation_Immunity.dds
+++ b/Common/Textures/Genes/Icons/Cumflation_Immunity.dds
--- a/Common/Textures/Genes/Icons/Drone.dds
+++ b/Common/Textures/Genes/Icons/Drone.dds
--- a/Common/Textures/Genes/Icons/Egg.dds
+++ b/Common/Textures/Genes/Icons/Egg.dds
--- a/Common/Textures/Genes/Icons/Elasticity.dds
+++ b/Common/Textures/Genes/Icons/Elasticity.dds
--- a/Common/Textures/Genes/Icons/Empty.dds
+++ b/Common/Textures/Genes/Icons/Empty.dds
--- a/Common/Textures/Genes/Icons/Extra_Anus.dds
+++ b/Common/Textures/Genes/Icons/Extra_Anus.dds
--- a/Common/Textures/Genes/Icons/Extra_Anus.png
+++ b/Common/Textures/Genes/Icons/Extra_Anus.png
--- a/Common/Textures/Genes/Icons/Extra_Breasts.dds
+++ b/Common/Textures/Genes/Icons/Extra_Breasts.dds
--- a/Common/Textures/Genes/Icons/Extra_Breasts.png
+++ b/Common/Textures/Genes/Icons/Extra_Breasts.png
--- a/Common/Textures/Genes/Icons/Extra_Vagina.dds
+++ b/Common/Textures/Genes/Icons/Extra_Vagina.dds
--- a/Common/Textures/Genes/Icons/Female_Only.dds
+++ b/Common/Textures/Genes/Icons/Female_Only.dds
--- a/Common/Textures/Genes/Icons/Fertile_anus.dds
+++ b/Common/Textures/Genes/Icons/Fertile_anus.dds
--- a/Common/Textures/Genes/Icons/Fertile_anus.png
+++ b/Common/Textures/Genes/Icons/Fertile_anus.png
--- a/Common/Textures/Genes/Icons/FertilinAlt.dds
+++ b/Common/Textures/Genes/Icons/FertilinAlt.dds
--- a/Common/Textures/Genes/Icons/FertilinDrainAlt.dds
+++ b/Common/Textures/Genes/Icons/FertilinDrainAlt.dds
--- a/Common/Textures/Genes/Icons/Fervent_Ovipositor.dds
+++ b/Common/Textures/Genes/Icons/Fervent_Ovipositor.dds
--- a/Common/Textures/Genes/Icons/Futa.dds
+++ b/Common/Textures/Genes/Icons/Futa.dds
--- a/Common/Textures/Genes/Icons/Gene_LitteredBirths.dds
+++ b/Common/Textures/Genes/Icons/Gene_LitteredBirths.dds
--- a/Common/Textures/Genes/Icons/Gene_LitteredBirths.png
+++ b/Common/Textures/Genes/Icons/Gene_LitteredBirths.png
--- a/Common/Textures/Genes/Icons/Generous_Donor.dds
+++ b/Common/Textures/Genes/Icons/Generous_Donor.dds
--- a/Common/Textures/Genes/Icons/Genitalia_Canine.dds
+++ b/Common/Textures/Genes/Icons/Genitalia_Canine.dds
--- a/Common/Textures/Genes/Icons/Genitalia_Canine.png
+++ b/Common/Textures/Genes/Icons/Genitalia_Canine.png
--- a/Common/Textures/Genes/Icons/Genitalia_Demon.dds
+++ b/Common/Textures/Genes/Icons/Genitalia_Demon.dds
--- a/Common/Textures/Genes/Icons/Genitalia_Demon.png
+++ b/Common/Textures/Genes/Icons/Genitalia_Demon.png
--- a/Common/Textures/Genes/Icons/Genitalia_Draconic.dds
+++ b/Common/Textures/Genes/Icons/Genitalia_Draconic.dds
--- a/Common/Textures/Genes/Icons/Genitalia_Draconic.png
+++ b/Common/Textures/Genes/Icons/Genitalia_Draconic.png
--- a/Common/Textures/Genes/Icons/Genitalia_Equine.dds
+++ b/Common/Textures/Genes/Icons/Genitalia_Equine.dds
--- a/Common/Textures/Genes/Icons/Genitalia_Equine.png
+++ b/Common/Textures/Genes/Icons/Genitalia_Equine.png
--- a/Common/Textures/Genes/Icons/Genitalia_Feline.dds
+++ b/Common/Textures/Genes/Icons/Genitalia_Feline.dds
--- a/Common/Textures/Genes/Icons/Genitalia_Feline.png
+++ b/Common/Textures/Genes/Icons/Genitalia_Feline.png
--- a/Common/Textures/Genes/Icons/Genitalia_alien_icon.dds
+++ b/Common/Textures/Genes/Icons/Genitalia_alien_icon.dds
--- a/Common/Textures/Genes/Icons/Genitalia_alien_icon.png
+++ b/Common/Textures/Genes/Icons/Genitalia_alien_icon.png
--- a/Common/Textures/Genes/Icons/Genitalia_croc_icon.dds
+++ b/Common/Textures/Genes/Icons/Genitalia_croc_icon.dds
--- a/Common/Textures/Genes/Icons/Genitalia_croc_icon.png
+++ b/Common/Textures/Genes/Icons/Genitalia_croc_icon.png
--- a/Common/Textures/Genes/Icons/Genitalia_ghost_icon.dds
+++ b/Common/Textures/Genes/Icons/Genitalia_ghost_icon.dds
--- a/Common/Textures/Genes/Icons/Genitalia_ghost_icon.png
+++ b/Common/Textures/Genes/Icons/Genitalia_ghost_icon.png
--- a/Common/Textures/Genes/Icons/Genitalia_hemi_icon.dds
+++ b/Common/Textures/Genes/Icons/Genitalia_hemi_icon.dds
--- a/Common/Textures/Genes/Icons/Genitalia_hemi_icon.png
+++ b/Common/Textures/Genes/Icons/Genitalia_hemi_icon.png
--- a/Common/Textures/Genes/Icons/Genitalia_human.dds
+++ b/Common/Textures/Genes/Icons/Genitalia_human.dds
--- a/Common/Textures/Genes/Icons/Genitalia_human.png
+++ b/Common/Textures/Genes/Icons/Genitalia_human.png
--- a/Common/Textures/Genes/Icons/Genitalia_marine_icon.dds
+++ b/Common/Textures/Genes/Icons/Genitalia_marine_icon.dds
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
vegapnk	ed7473ddfd	Merge pull request #82 from vegapnk/dev 2.0.0 Release	2024-05-30 16:06:03 +02:00
Vegapnk	983bbfd727	Added 2.0.0 Binary	2024-05-30 15:59:47 +02:00
Vegapnk	c93c80e0ed	Made some Genes not pop up in quests, typos	2024-05-30 15:57:07 +02:00
Vegapnk	491c54cd03	Minor Changes to Settings	2024-05-30 15:43:37 +02:00
Vegapnk	fb9cf71761	Archotech penis Check, fixes #71	2024-05-30 15:18:44 +02:00
Vegapnk	eab2485787	Rescued Succubus Artifacts	2024-05-30 11:36:34 +02:00
Vegapnk	51b988f18c	Rescued Cocoonweaver, FerventOvipositor and InsectIncubator into Breeding Genes	2024-05-30 09:40:57 +02:00
Vegapnk	9c273d5567	Updated Documentation	2024-05-30 09:10:50 +02:00
Vegapnk	ee2be0375c	Put Licentia Parts back in, but commented out so I dont forget	2024-05-30 08:52:58 +02:00
Vegapnk	90653ddc9e	Removed Sadist for now	2024-05-30 08:26:40 +02:00
Vegapnk	883dfefa3e	minor changes - in-migration	2024-05-29 18:16:26 +02:00
vegapnk	b67a8db320	Merge pull request #81 from Jaaldabaoth/main Jaaldabaoth pull request	2024-05-29 15:43:53 +02:00
Jaaldabaoth	95b48cc008	settings, random genitalia selectio	2024-05-29 13:00:55 +02:00
Jaaldabaoth	25614f42ae	update and integration of lewdbiotech	2024-05-28 21:40:07 +02:00
Jaaldabaoth	2b39105fe0	sadist/masochist update	2024-05-28 19:56:52 +02:00
Jaaldabaoth	42eb116d15	mitosis bugfix	2024-05-28 17:14:17 +02:00
Jaaldabaoth	60eef21c0e	resizing age slider	2024-05-28 12:16:10 +02:00
Jaaldabaoth	35fbe09ab7	patch initiate lovin	2024-05-28 00:51:33 +02:00
Jaaldabaoth	0e53cdb03d	vasectomy patch	2024-05-27 23:27:35 +02:00
Jaaldabaoth	9ae622bb7f	highmates patch	2024-05-27 21:19:08 +02:00
Jaaldabaoth	72b3c10c56	Merge pull request #1 from flock-of-birds/generalised-genital-genes Generalised genital genes	2024-05-27 12:26:56 +02:00
a flock of birds	440589faad	Removed unnecessary pragma	2024-05-27 10:20:40 +01:00
a flock of birds	2cf89ba6df	Removed properties from GenitaliaTypeExtension	2024-05-27 09:42:09 +01:00
a flock of birds	20f1cb67f4	Merge branch 'main' of https://github.com/Jaaldabaoth/RJW-Genes into generalised-genital-genes	2024-05-27 08:42:32 +01:00
Jaaldabaoth	67bab9b52f	typo	2024-05-27 01:32:52 +02:00
Jaaldabaoth	07a0ab0600	resplice patch	2024-05-27 01:27:10 +02:00
a flock of birds	a128dbac01	Prevented GenitaliaChanger from creating redundant parts and refactored to allow changing single parts	2024-05-27 00:13:01 +01:00
a flock of birds	a5c8843faf	Switched default GenitaliaTypeExtension parts from 'generic' to 'average'.	2024-05-27 00:04:28 +01:00
a flock of birds	1a132da48a	GenitaliaUtility tweaks - Un-hardcoded GetXForGene methods, allowing genderbending genes to affect more part types * Left GetBreastsForGene alone for now since genital genes don't currently seem to change breasts when added initially - Refactored GetGenitaliaTypeGeneForPawn to use shared gene class instead of requiring defName take a specific form	2024-05-26 23:58:30 +01:00
a flock of birds	bbf7bb2847	Merge branch 'main' of https://github.com/Jaaldabaoth/RJW-Genes into generalised-genital-genes	2024-05-26 23:46:50 +01:00
a flock of birds	d218fccb10	Converted new genes	2024-05-26 23:43:49 +01:00
Jaaldabaoth	0617ea4995	succubi are back	2024-05-26 23:41:32 +02:00
Jaaldabaoth	701168f642	unpatching vanilla pregnancy	2024-05-26 21:51:09 +02:00
Jaaldabaoth	ee6fdae351	added loadfolder	2024-05-26 18:17:16 +02:00
Jaaldabaoth	f37407f817	fertile anus gene	2024-05-26 17:45:00 +02:00
a flock of birds	e7faf283fa	Merge branch 'main' of https://github.com/Jaaldabaoth/RJW-Genes into generalised-genital-genes	2024-05-26 10:57:29 +01:00
a flock of birds	197634f920	Unhardcoded genital type genes	2024-05-26 10:52:18 +01:00
Jaaldabaoth	246f227792	patched relation utility	2024-05-26 10:11:24 +02:00
Jaaldabaoth	e372c8fe71	updated icons	2024-05-25 22:12:31 +02:00
a flock of birds	f45714c44c	Removed user-speciic config from index	2024-05-25 18:28:52 +01:00
Jaaldabaoth	7dbef0d19a	genitalia addition	2024-05-25 01:13:00 +02:00
a flock of birds	4ccc63c1a8	Updated RJW reference to point to v1.5 assembly	2024-05-25 00:11:09 +01:00
Jaaldabaoth	8159bb792b	added 4 genitalia	2024-05-24 20:03:02 +02:00
Jaaldabaoth	0b7e83a36b	addition of 4 genitalia	2024-05-24 20:01:30 +02:00
Jaaldabaoth	a0edbb2a89	typo correction	2024-05-24 01:20:21 +02:00
Jaaldabaoth	893f37fd2d	1.5 update	2024-05-24 00:41:20 +02:00
Jaaldabaoth	e6db43f31d	1.5 update	2024-05-24 00:33:37 +02:00
Jaaldabaoth	68809d5aef	Update README.md	2024-05-24 00:20:46 +02:00
Vegapnk	7d9e399a47	Nested 2 Mod-Search for AG_Malachai, Fixes #68	2023-11-02 11:52:48 +01:00
Vegapnk	e805cfe025	Fix #69 by adding looking for the Sexperience mod	2023-11-02 11:48:06 +01:00
Vegapnk	a3a6273b86	Updated Changelog	2023-10-24 07:18:24 +02:00
Vegapnk	87b5500018	re-added 2 xenotype patches, formatting of patches	2023-10-24 07:16:16 +02:00
Vegapnk	d5eefa7608	revert `9968312` due to issues, never accept prs	2023-10-24 07:10:34 +02:00
Vegapnk	f4002ed9f2	Updated Manifest, build dll for release	2023-10-22 16:29:24 +02:00
Vegapnk	65f74e7369	Added a simple social worker for aphrodisiac genes, closes #50	2023-10-22 16:25:52 +02:00
Vegapnk	996831269d	Added two patches for Alpha Genes, closes #65	2023-10-22 15:51:36 +02:00
Vegapnk	483965ea19	Made empathetic Lifeforce public, fixes #66	2023-10-22 15:43:22 +02:00
vegapnk	49e66d3302	Update CHANGELOG.md after #64	2023-10-13 08:42:59 +02:00
vegapnk	7b0a7102a9	Merge pull request #64 from mwcrow/main Fixed closing tag doesn't match opening tag error	2023-10-13 08:39:54 +02:00
mwcrow	a2f0840c79	Update Lifeforce.xml Fixed closing tag doesn't match opening tag error	2023-10-06 19:45:39 +02:00
vegapnk	729f60151b	Merge pull request #62 from vegapnk/dev Version 1.3. Release I guess	2023-09-13 17:04:11 +02:00
Vegapnk	071d5b578d	New build for 1.3.0, minor change in csproj	2023-09-13 17:00:26 +02:00
Vegapnk	3db05a8dce	Added some nullchecks for queen existance, fixing #60	2023-09-13 16:55:01 +02:00
Vegapnk	70a15dbfed	Made Letters Translatable, fixes #58	2023-07-27 08:14:46 +02:00
Vegapnk	051f67af55	Penis Hypergrowth also makes pawn hypersexual	2023-07-26 17:29:58 +02:00
Vegapnk	d4e90f6762	Rebalancing Fertilin Costs, minor cleanup in XML	2023-07-26 17:14:00 +02:00
Vegapnk	0aefb45d9b	Custom Xenotypes should work now with Hivelogic	2023-07-26 17:06:17 +02:00
Vegapnk	57bb1950e4	Made evergrowth Genitalia tick configurable	2023-07-18 07:00:45 +02:00
Vegapnk	7c22dcd348	Using new ModExtensions for AphrodisiacPheromone	2023-07-17 07:21:32 +02:00
Vegapnk	132344b294	LifeForceEmpath uses new XML DefModExtension	2023-07-17 07:09:05 +02:00
Vegapnk	ef1e3cdd0f	Added generic DefModExtension for Distance and Ticks	2023-07-17 06:58:00 +02:00
Vegapnk	d21a665a3c	Build for 1.3 beta 1	2023-07-16 11:58:32 +02:00
Vegapnk	188cd070f7	Added Changelog for LifeForce Empath #42	2023-07-16 11:57:38 +02:00
Vegapnk	507c150b38	Added a Lifeforce Empath Gene	2023-07-16 11:55:38 +02:00
Vegapnk	d5580ba92a	Added a new gene that increases penis size on oral sex	2023-07-16 10:59:06 +02:00
Vegapnk	93a4699fba	Made an oopsie	2023-07-16 10:19:49 +02:00
Vegapnk	2598e4cc49	Hardened Genderfluid LicentiaLab Hediff Removal	2023-07-16 10:18:52 +02:00
Vegapnk	1ddb7dc9bd	Set Genderfluid times out of dev, soreness of vagina gets removed on change.	2023-07-16 10:15:01 +02:00
Vegapnk	b18e4077a4	New Gene removing sex need	2023-07-16 09:48:49 +02:00
Vegapnk	61400c7fa5	Updated Succubus Textures thanks to Monti	2023-07-16 09:35:12 +02:00
Vegapnk	5b2e644134	Added new Textures for Wings, thanks to Monti	2023-07-16 09:12:55 +02:00
Vegapnk	97c153f468	Added a Gene for Gender Fluid Pawns	2023-07-16 08:54:01 +02:00
Vegapnk	ae3c4471cf	Updated Changelog after PR	2023-06-28 15:05:54 +02:00
vegapnk	9ef884eb76	Merge pull request #53 from WasmachenDennSachenSo/Fix-Icons Fix white outlines on gene icons	2023-06-28 15:01:19 +02:00
Vegapnk	15a72ae250	Revamped patches for Cum-Eating Succubi, #41 and 48	2023-06-28 14:59:20 +02:00
Vegapnk	ada4a87efc	Added new Gene for evergrowing cock	2023-06-28 14:45:43 +02:00
Wasmachensachen	a7009cc3ae	Fix full colors - forgot to tick convert to srgb.	2023-06-24 09:20:58 +02:00
Wasmachensachen	1329fbc016	Fix white outlines on icons - reexport all icons with 1% black background at 512x512 NN.	2023-06-24 08:48:59 +02:00
Vegapnk	5e3bbe66a3	New Patch for Used Condoms from Infi	2023-06-22 12:56:36 +02:00
Vegapnk	f7445f8df7	Minor Fix for #52 , updated docs and a small preview image	2023-06-18 21:02:31 +02:00