Added genes to racegroups, todos and small update readme

Common/Defs/Genes/GeneCategories.xml

@@ -50,9 +50,15 @@
   </GeneCategoryDef>
 
   <GeneCategoryDef>
-    <defName>rjw_damage</defName>
+    <defName>rjw_genes_damage</defName>
     <label>Genital Related Damage</label>
     <displayPriorityInXenotype>11</displayPriorityInXenotype>
   </GeneCategoryDef>
 
+  <GeneCategoryDef>
+    <defName>rjw_genes_special</defName>
+    <label>Genital Related Damage</label>
+    <displayPriorityInXenotype>8</displayPriorityInXenotype>
+  </GeneCategoryDef>
+  
 </Defs>

Common/Defs/Genes/GeneDefs_Damage.xml

@@ -4,7 +4,7 @@
   <GeneDef MayRequire="LustLicentia.RJWLabs">
     <defName>rjw_genes_elasticity</defName>
     <label>Elasticity</label>
-    <displayCategory>rjw_damage</displayCategory>
+    <displayCategory>rjw_genes_damage</displayCategory>
     <description>This Xenotype cannot get stretched by huge penetrators.</description>
     <iconPath>Genes/Icons/Elasticity</iconPath>
     <geneClass>RJW_Genes.Gene_Elasticity</geneClass>

Common/Defs/Genes/GeneDefs_SexSpecial.xml

@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<Defs>
+    <GeneDef>
+        <defName>rjw_genes_orgasm_rush</defName>
+        <label>Orgasm Rush</label>
+        <displayCategory>rjw_genes_special</displayCategory>
+        <description>On Orgasm, carriers of this gene get a boost in activity. (rest-need is partially filled)</description>
+        <biostatCpx>1</biostatCpx>
+        <iconPath>UI/Memes/FleshPurity</iconPath>
+        <displayOrderInCategory>1</displayOrderInCategory>
+    </GeneDef>
+    
+</Defs>

Common/Defs/RaceGeneDefs/RaceGeneDefs_Vanilla_Racegroups.xml

@@ -6,7 +6,31 @@
 		<genes>
 			<li>
 				<defName>Ears_Floppy</defName>
-				<chance>0.9</chance>
+				<chance>0.75</chance>
+			</li>
+			<li>
+				<defName>Tail_Furry</defName>
+				<chance>0.2</chance>
+			</li>
+			<li>
+				<defName>Furskin</defName>
+				<chance>0.5</chance>
+			</li>
+			<li>
+				<defName>rjw_genes_canine_genitalia</defName>
+				<chance>0.4</chance>
+			</li>
+			<li>
+				<defName>ViolenceDisabled</defName>
+				<chance>0.05</chance>
+			</li>
+			<li>
+				<defName>PsychicBonding</defName>
+				<chance>0.05</chance>
+			</li>
+			<li>
+				<defName>Mood_Sanguine</defName>
+				<chance>0.1</chance>
 			</li>			
 		</genes> 
 	</RJW_BGS.RaceGeneDef>
@@ -19,6 +43,30 @@
 			<li>
 				<defName>Beauty_Ugly</defName>
 				<chance>0.5</chance>
+			</li>
+			<li>
+				<defName>Immunity_Strong</defName>
+				<chance>0.6</chance>
+			</li>
+			<li>
+				<defName>ToxicEnvironmentResistance_Partial</defName>
+				<chance>0.4</chance>
+			</li>
+			<li>
+				<defName>rjw_genes_ovipositor_genitalia</defName>
+				<chance>0.15</chance>
+			</li>
+			<li>
+				<defName>rjw_genes_insectincubator</defName>
+				<chance>0.1</chance>
+			</li>
+			<li>
+				<defName>rjw_genes_insectbreeder</defName>
+				<chance>0.1</chance>
+			</li>
+			<li>
+				<defName>Body_Thin</defName>
+				<chance>0.3</chance>
 			</li>			
 		</genes>
 	</RJW_BGS.RaceGeneDef>
@@ -27,10 +75,22 @@
 		<defName>Feline</defName> 
 		<raceGroup>Feline_Group</raceGroup>
 		<genes>
+			<li>
+				<defName>Tail_Furry</defName>
+				<chance>0.2</chance>
+			</li>
+			<li>
+				<defName>Furskin</defName>
+				<chance>0.5</chance>
+			</li>
 			<li>
 				<defName>Ears_Cat</defName>
 				<chance>0.9</chance>
 			</li>
+			<li>
+				<defName>PsychicBonding</defName>
+				<chance>0.05</chance>
+			</li>
 			<li>
 				<defName>Sleepy</defName>
 				<chance>0.25</chance>
@@ -38,21 +98,49 @@
 			<li>
 				<defName>DarkVision</defName>
 				<chance>0.25</chance>
+			</li>
+			<li>
+				<defName>rjw_genes_feline_genitalia</defName>
+				<chance>0.25</chance>
 			</li>			
 		</genes>
 	</RJW_BGS.RaceGeneDef>
-<!--	
+	
 	<RJW_BGS.RaceGeneDef>
 		<defName>Equine</defName> 
 		<raceGroup>Equine_Group</raceGroup>
 		<genes>
 			<li>
-				<defName>StrongStomach</defName>
-				<chance>0.5</chance>
-			</li>			
+				<defName>Furskin</defName>
+				<chance>0.2</chance>
+			</li>
+			<li>
+				<defName>rjw_genes_equine_genitalia</defName>
+				<chance>0.25</chance>
+			</li>
+			<li>
+				<defName>MoveSpeed_Quick</defName>
+				<chance>0.4</chance>
+			</li>
+			<li>
+				<defName>MoveSpeed_VeryQuick</defName>
+				<chance>0.1</chance>
+			</li>	
+			<li>
+				<defName>rjw_genes_much_cum</defName>
+				<chance>0.3</chance>
+			</li>	
+			<li>
+				<defName>rjw_genes_very_much_cum</defName>
+				<chance>0.05</chance>
+			</li>
+			<li>
+				<defName>Body_Hulk</defName>
+				<chance>0.4</chance>
+			</li>		
 		</genes>
 	</RJW_BGS.RaceGeneDef>
--->	
+
 	<RJW_BGS.RaceGeneDef>
 		<defName>Dragon</defName> 
 		<raceGroup>Dragon_Group</raceGroup>
@@ -64,6 +152,38 @@
 			<li>
 				<defName>Headbone_CenterHorn</defName>
 				<chance>0.9</chance>
+			</li>
+			<li>
+				<defName>VoiceRoar</defName>
+				<chance>0.6</chance>
+			</li>
+			<li>
+				<defName>MaxTemp_SmallIncrease</defName>
+				<chance>0.7</chance>
+			</li>
+			<li>
+				<defName>MaxTemp_LargeIncrease</defName>
+				<chance>0.1</chance>
+			</li>
+			<li>
+				<defName>rjw_genes_draconic_genitalia</defName>
+				<chance>0.6</chance>
+			</li>
+			<li>
+				<defName>FireResistant</defName>
+				<chance>0.15</chance>
+			</li>	
+			<li>
+				<defName>rjw_genes_much_cum</defName>
+				<chance>0.3</chance>
+			</li>	
+			<li>
+				<defName>rjw_genes_very_much_cum</defName>
+				<chance>0.05</chance>
+			</li>
+			<li>
+				<defName>Body_Hulk</defName>
+				<chance>0.7</chance>
 			</li>			
 		</genes> 
 	</RJW_BGS.RaceGeneDef>
@@ -72,9 +192,33 @@
 		<defName>Rodent</defName> 
 		<raceGroup>Rodent_Group</raceGroup>
 		<genes>
+			<li>
+				<defName>Furskin</defName>
+				<chance>0.2</chance>
+			</li>
 			<li>
 				<defName>Fertile</defName>
 				<chance>0.25</chance>
+			</li>
+			<li>
+				<defName>FastRunner</defName>
+				<chance>0.6</chance>
+			</li>
+			<li>
+				<defName>rjw_genes_small_genitalia</defName>
+				<chance>0.6</chance>
+			</li>
+			<li>
+				<defName>Immunity_Strong</defName>
+				<chance>0.4</chance>
+			</li>
+			<li>
+				<defName>ToxicEnvironmentResistance_Partial</defName>
+				<chance>0.1</chance>
+			</li>
+			<li>
+				<defName>Body_Thin</defName>
+				<chance>0.45</chance>
 			</li>			
 		</genes> 
 	</RJW_BGS.RaceGeneDef>
@@ -83,34 +227,27 @@
 		<defName>Racoon</defName> 
 		<raceGroup>Raccon_Group</raceGroup>
 		<genes>
+			<li>
+				<defName>Furskin</defName>
+				<chance>0.25</chance>
+			</li>
+			<li>
+				<defName>Tail_Furry</defName>
+				<chance>0.25</chance>
+			</li>
 			<li>
 				<defName>StrongStomach</defName>
 				<chance>0.5</chance>
-			</li>			
+			</li>
+			<li>
+				<defName>Immunity_Strong</defName>
+				<chance>0.2</chance>
+			</li>
+			<li>
+				<defName>ToxicEnvironmentResistance_Partial</defName>
+				<chance>0.1</chance>
+			</li>				
 		</genes>
 	</RJW_BGS.RaceGeneDef>
-<!--	
-	<RJW_BGS.RaceGeneDef>
-		<defName>Needle</defName> 
-		<raceGroup>Needle_Group</raceGroup>
-		<genes>
-			<li>
-				<defName>StrongStomach</defName>
-				<chance>0.5</chance>
-			</li>			
-		</genes> 
-	</RJW_BGS.RaceGeneDef>
--->
-<!--
-	<RJW_BGS.RaceGeneDef>
-		<defName>Hemi</defName> 
-		<raceGroup>Hemi_Group</raceGroup>
-		<genes>
-			<li>
-				<defName>StrongStomach</defName>
-				<chance>0.5</chance>
-			</li>			
-		</genes> 
-	</RJW_BGS.RaceGeneDef>
--->
+
 </Defs>

README.md

@@ -16,7 +16,7 @@ This is my first Mod I started from scratch so any feedback is very welcome.
 
 See [planned things](TODOS.md) and feel free to contribute. 
 With the Human-Animal-Gene Inheritance we have a lot of XML that you can contribute! 
-We have a [template](./Common/Defs/RaceGeneDefs/RaceGeneDefs_template.xml) and you can add animals and/or genes from mods there. 
+We have a [template](./Common/Defs/RaceGeneDefs/RaceGeneDefs_template.xml) and you can add animals and/or genes from mods there (Racegroups are base-rjw). 
 
 ## Bugs? 
 

Source/GeneDefOf.cs

@@ -10,6 +10,8 @@ namespace RJW_Genes
 		public static readonly GeneCategoryDef rjw_genes_genitalia_size;
 		public static readonly GeneCategoryDef rjw_genes_gender;
 		public static readonly GeneCategoryDef rjw_genes_breeding;
+		public static readonly GeneCategoryDef rjw_genes_damage;
+		public static readonly GeneCategoryDef rjw_genes_special;
 
 		// Base Genitalia Types
 		public static readonly GeneDef rjw_genes_equine_genitalia;
@@ -65,5 +67,9 @@ namespace RJW_Genes
 
 		// Damage & Side Effects 
 		[MayRequire("LustLicentia.RJWLabs")] public static readonly GeneDef rjw_genes_elasticity;
+
+		// Special
+		public static readonly GeneDef rjw_genes_orgasm_rush;
+
 	}
 }

Source/Genes/Special/Patch_OrgasmRush.cs

@@ -0,0 +1,31 @@
+using HarmonyLib;
+using rjw;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace RJW_Genes
+{
+	
+	[HarmonyPatch(typeof(SexUtility), nameof(SexUtility.SatisfyPersonal))]
+	public static class Patch_OrgasmRush
+	{
+
+		private const float REST_INCREASE = 0.05f;
+
+		public static void Postfix(SexProps props)
+		{
+			// ShortCuts: Exit Early if Pawn or Partner are null (can happen with Animals or Masturbation)
+			if (props.pawn == null || !props.hasPartner())
+				return;
+
+			if (props.pawn.genes.HasGene(GeneDefOf.rjw_genes_orgasm_rush))
+            {
+				props.pawn.needs.rest.CurLevel += REST_INCREASE;
+            }
+		}
+	}
+
+}

Source/Rjw-Genes.csproj

@@ -116,6 +116,7 @@
     <Compile Include="Genes\Genitalia\GenitaliaChanger.cs" />
     <Compile Include="Genes\RJW_Gene.cs" />
     <Compile Include="Genes\Genitalia\GenitaliaUtility.cs" />
+    <Compile Include="Genes\Special\Patch_OrgasmRush.cs" />
     <Compile Include="HarmonyInit.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
     <Compile Include="RJW_Genes.cs" />

TODOS.md

@@ -12,10 +12,14 @@ Showstopper here is the amount of code required, and that I need to understand a
 
 **Infectious Hypersexuality Gene** (Maybe?) add Hypersexuality Gene through sex with a certain chance. 
 
-**Stat Boost on Orgasm** restore stamina 
-
 **Cum Addiction** add Cum-Addiction from Sexpererience, slowly loose conciousness while addiction is not attended.
 
+**Cum-Drugs** eating cum has an effect similar to Go-Juice (including (separate?) addiction)
+
+**More Orgasm Boost** currently only does sleep, other things could be cool here too. Maybe a separate hediff boosting movement or fight. 
+
+**Self-Fertilizing Eggs** Pawns fertilize eggs that are put inside them (with themselves as a parent)
+
 ## Animal Gene Inheritance 
 
 It should be doable to have a per-category list of genes that a child can inherit on bestiality. 
@@ -34,4 +38,11 @@ There were some suggestions on the Discord I saved them somewhere else. I am far
 - Genitalia deal damage as per size (on normal sex-use)
 - Genitalia can cause Terror (as ability)
 - Cumshot Sniper Abilities
-- Healing Pussy
+- Healing Pussy
+
+## Things to add/change for base-rjw 
+
+(Bit dependable on RJW-Core people)
+
+1. Make Racegroup-Defs accessible and non-private [This file here](https://gitgud.io/Ed86/rjw/-/blob/master/1.4/Source/Common/Helpers/RaceGroupDef_Helper.cs)
+2. Make [this](https://gitgud.io/Ed86/rjw/-/blob/master/1.4/Source/Common/Helpers/Gender_Helper.cs#L316) not warn, to reduce errors towards users