Merge branch 'dev' into main

Source/Genes/Breeding/Patch_EggFertilization.cs

@@ -14,9 +14,8 @@ namespace RJW_Genes
     /// Normal Egg-Pregnancy logic is in https://gitgud.io/Ed86/rjw/-/blob/master/1.4/Source/Modules/Pregnancy/Pregnancy_Helper.cs
     /// </summary>
     [HarmonyPatch(typeof(SexUtility), "Aftersex")]
-    static class PatchEggFertilizationHelper
+    static class Patch_EggFertilization
     {
-        [HarmonyTranspiler]
         public static void Postfix(SexProps props)
         {
             // Only Fertilize on vaginal / anal sex
@@ -59,7 +58,7 @@ namespace RJW_Genes
         }
 
 
-        private static Boolean canDoEggFertilization(Pawn a, Pawn b)
+        private static bool canDoEggFertilization(Pawn a, Pawn b)
         {
 
             // No Partner / Other Errors

Source/Genes/Damage/Gene_Elasticity.cs

@@ -10,8 +10,6 @@ namespace RJW_Genes
     /// </summary>
     public class Gene_Elasticity : Gene
     {
-        
-        private int ticksToReset = RESET_INTERVAL; 
         private const int RESET_INTERVAL = 60000; // 60k should be 1 day 
 
         public override void PostAdd()
@@ -26,11 +24,8 @@ namespace RJW_Genes
         public override void Tick()
         {
             base.Tick();
-            --this.ticksToReset;
-            if (this.ticksToReset > 0)
-                return;
-            this.ticksToReset = RESET_INTERVAL;
-            ResetSeverity();
+            if (pawn.IsHashIntervalTick(RESET_INTERVAL))
+                ResetSeverity();
         }
 
         public override void PostRemove()

Source/Genes/Damage/Gene_Unbreakable.cs

@@ -0,0 +1,41 @@
+using LicentiaLabs;
+using rjw;
+using Verse;
+
+namespace RJW_Genes
+{
+    /// <summary>
+    /// This Gene regularly removes the broken hediff of a pawn. 
+    /// Blocking / Removing thoughts are done in an XML Patch.
+    /// </summary>
+    public class Gene_Unbreakable : Gene
+    {
+        /// DevNote: I first tried to Harmony-Postfix the AfterSexUtility and never add it - but that failed? 
+
+        private const int RESET_INTERVAL = 30000; // 30k should be 0.5 day 
+        public override void PostAdd()
+        {
+            base.PostAdd();
+            RemoveBrokenHediff();
+        }
+
+        public override void Tick()
+        {
+            base.Tick();
+            if (pawn.IsHashIntervalTick(RESET_INTERVAL))
+                RemoveBrokenHediff();
+        }
+
+
+
+        private void RemoveBrokenHediff()
+        {
+            // Clean-Up of existing feeling brokens
+            var maybeBrokenHediff = pawn.health.hediffSet.GetFirstHediffOfDef(xxx.feelingBroken);
+            if (maybeBrokenHediff != null)
+            {
+                pawn.health.RemoveHediff(maybeBrokenHediff);
+            }
+        }
+    }
+}

Source/Genes/ExtraGenitalia/Gene_Futa.cs

@@ -13,6 +13,12 @@ namespace RJW_Genes
         {
             base.PostMake();
 
+            // If the Pawn is already a Futa, do not do anything. Can Happen by Base-RJW Spawn Chance or potentially races / other mods. 
+            if (IsAlreadyFuta(pawn))
+            {
+                return;
+            }
+
             if (GenderUtility.IsFemale(pawn) && additional_genital == null)
             {
                 createAndAddPenis();
@@ -27,6 +33,12 @@ namespace RJW_Genes
         {
             base.PostAdd();
 
+            // If the Pawn is already a Futa, do not do anything. Can Happen by Base-RJW Spawn Chance or potentially races / other mods. 
+            if (IsAlreadyFuta(pawn))
+            {
+                return;
+            }
+
             if (pawn.gender == Gender.Female && additional_genital == null)
             {
                 createAndAddPenis();
@@ -79,5 +91,15 @@ namespace RJW_Genes
             pawn.health.AddHediff(additional_genital, partBPR);
         }
 
+        private static bool IsAlreadyFuta(Pawn pawn)
+        {
+            if (pawn == null)
+                return false;
+            if (!Genital_Helper.has_genitals(pawn))
+                return false;
+            return 
+                (Genital_Helper.has_penis_fertile(pawn) || Genital_Helper.has_penis_infertile(pawn)) 
+                && Genital_Helper.has_vagina(pawn) ;
+        }
     }
 }

Source/Genes/GeneUtility.cs

@@ -1,4 +1,5 @@
 using System;
+using System.Collections.Generic;
 using Verse;
 
 namespace RJW_Genes
@@ -23,6 +24,24 @@ namespace RJW_Genes
             return pawn.genes.HasGene(GeneDefOf.rjw_genes_insectincubator);
         }
 
+        public static bool IsYouthFountain(Pawn pawn)
+        {
+            if (pawn.genes == null)
+            {
+                return false;
+            }
+            return pawn.genes.HasGene(GeneDefOf.rjw_genes_youth_fountain);
+        }
+
+        public static bool IsAgeDrainer(Pawn pawn)
+        {
+            if (pawn.genes == null)
+            {
+                return false;
+            }
+            return pawn.genes.HasGene(GeneDefOf.rjw_genes_sex_age_drain);
+        }
+
         public static bool IsInsectBreeder(Pawn pawn)
         {
             if (pawn.genes == null)
@@ -67,5 +86,35 @@ namespace RJW_Genes
             }
             return pawn.genes.HasGene(GeneDefOf.rjw_genes_generous_donor);
         }
+
+        public static bool IsUnbreakable(Pawn pawn)
+        {
+            if (pawn.genes == null)
+            {
+                return false;
+            }
+            return pawn.genes.HasGene(GeneDefOf.rjw_genes_unbreakable);
+        }
+
+
+        public static bool HasGenitaliaResizingGenes(Pawn pawn)
+        {
+            return !GetGenitaliaResizingGenes(pawn).NullOrEmpty();
+        }
+
+        public static List<Gene_GenitaliaResizingGene> GetGenitaliaResizingGenes(Pawn pawn)
+        {
+            var ResizingGenes = new List<Gene_GenitaliaResizingGene>();
+
+            // Error Handling: Issue with Pawn or Genes return empty.
+            if (pawn == null || pawn.genes == null)
+                return ResizingGenes;
+
+            foreach (Gene gene in pawn.genes.GenesListForReading)
+                if (gene is Gene_GenitaliaResizingGene resizing_gene)
+                    ResizingGenes.Add(resizing_gene);
+
+            return ResizingGenes;
+        }
     }
 }

Source/Genes/GenitaliaSize/Gene_BigBreasts.cs

@@ -1,24 +1,12 @@
 using Verse;
 namespace RJW_Genes
 {
-    public class Gene_BigBreasts : RJW_Gene
+    public class Gene_BigBreasts : Gene_GenitaliaResizingGene
     {
-
-        public override void PostMake()
+        public override void Resize()
         {
-            base.PostMake();
-
-            if (pawn.gender == Gender.Female)
-                SizeAdjuster.AdjustAllBreastSizes(pawn,0.5f,1.0f);
-        }
-        
-        public override void PostAdd()
-        {
-            base.PostAdd();
             if (pawn.gender == Gender.Female)
                 SizeAdjuster.AdjustAllBreastSizes(pawn, 0.5f, 1.0f);
         }
-
-
     }
-}
+}

Source/Genes/GenitaliaSize/Gene_BigMaleGenitalia.cs

@@ -1,20 +1,10 @@
 namespace RJW_Genes
 {
-    public class Gene_BigMaleGenitalia : RJW_Gene
+    public class Gene_BigMaleGenitalia : Gene_GenitaliaResizingGene
     {
-
-        public override void PostMake()
+        public override void Resize()
         {
-            base.PostMake();
-
-            SizeAdjuster.AdjustAllPenisSizes(pawn,0.5f,1.0f);
-        }
-        
-        public override void PostAdd()
-        {
-            base.PostAdd();
             SizeAdjuster.AdjustAllPenisSizes(pawn, 0.5f, 1.0f);
         }
-
     }
-}
+}

Source/Genes/GenitaliaSize/Gene_GenitaliaResizingGene.cs

@@ -0,0 +1,49 @@
+namespace RJW_Genes
+{
+    /// <summary>
+    /// Parent Gene for Genitalia Resizing. All Resizing genes should inherit for this class. 
+    /// 
+    /// This helps with some functions (e.g. "hasGenitaliaResizingGenes(pawn)") but also to fire genitalia resizing later in life for Pawns. 
+    /// (No Children with huge ding dongs, and I don't want kids with tight anuses I am not that degenerate)
+    /// </summary>
+    public abstract class Gene_GenitaliaResizingGene : RJW_Gene
+    {
+
+        public const int RESIZING_AGE = 20;
+        public bool WasApplied { get; set; }
+
+        public override void PostMake()
+        {
+            base.PostMake();
+            if (pawn.ageTracker.AgeBiologicalYears >= RESIZING_AGE)
+            {
+                Resize();
+                WasApplied = true;
+            }
+        }
+
+        public override void PostAdd()
+        {
+            base.PostAdd();
+            if (pawn.ageTracker.AgeBiologicalYears >= RESIZING_AGE)
+            {
+                Resize();
+                WasApplied = true;
+            }
+        }
+
+        /// <summary>
+        /// Used to resize the pawns genitalia. 
+        /// All Logic should be put here: 
+        /// 1. Filters for Gender
+        /// 2. Filters for Genitalia Existance
+        /// 3. Selection of right Genitalia 
+        /// 4. Adjustment of Size
+        /// 
+        /// I kept it intentionally broad, so that e.g. the Penis Resize can resize multiple penises and also for futas, 
+        /// while the breast-gene is female only. 
+        /// </summary>
+        public abstract void Resize();
+
+    }
+}

Source/Genes/GenitaliaSize/Gene_LooseAnus.cs

@@ -1,22 +1,12 @@
-namespace RJW_Genes
+using Verse;
+
+namespace RJW_Genes
 {
-    public class Gene_LooseAnus : RJW_Gene
+    public class Gene_LooseAnus : Gene_GenitaliaResizingGene
     {
-
-        public override void PostMake()
+        public override void Resize()
         {
-            base.PostMake();
-
             SizeAdjuster.AdjustAllAnusSizes(pawn, 0.5f, 1.0f);
         }
-        
-        public override void PostAdd()
-        {
-            base.PostAdd();
-            SizeAdjuster.AdjustAllAnusSizes(pawn, 0.5f, 1.0f);
-        }
-
-
-
     }
 }

Source/Genes/GenitaliaSize/Gene_LooseFemaleGenitalia.cs

@@ -1,22 +1,12 @@
-namespace RJW_Genes
+using Verse;
+
+namespace RJW_Genes
 {
-    public class Gene_LooseFemaleGenitalia : RJW_Gene
+    public class Gene_LooseFemaleGenitalia : Gene_GenitaliaResizingGene
     {
-
-        public override void PostMake()
+        public override void Resize()
         {
-            base.PostMake();
-
             SizeAdjuster.AdjustAllVaginaSizes(pawn, 0.5f, 1.0f);
         }
-        
-        public override void PostAdd()
-        {
-            base.PostAdd();
-            SizeAdjuster.AdjustAllVaginaSizes(pawn, 0.5f, 1.0f);
-        }
-
-
-
     }
 }

Source/Genes/GenitaliaSize/Gene_SmallBreasts.cs

@@ -1,18 +1,11 @@
-namespace RJW_Genes
+using Verse;
+
+namespace RJW_Genes
 {
-    public class Gene_SmallBreasts : RJW_Gene
+    public class Gene_SmallBreasts : Gene_GenitaliaResizingGene
     {
-
-        public override void PostMake()
+        public override void Resize()
         {
-            base.PostMake();
-
-            SizeAdjuster.AdjustAllBreastSizes(pawn, 0.0f, 0.5f);
-        }
-        
-        public override void PostAdd()
-        {
-            base.PostAdd();
             SizeAdjuster.AdjustAllBreastSizes(pawn, 0.0f, 0.5f);
         }
     }

Source/Genes/GenitaliaSize/Gene_SmallMaleGenitalia.cs

@@ -1,20 +1,10 @@
 namespace RJW_Genes
 {
-    public class Gene_SmallMaleGenitalia : RJW_Gene
+    public class Gene_SmallMaleGenitalia : Gene_GenitaliaResizingGene
     {
-
-        public override void PostMake()
+        public override void Resize()
         {
-            base.PostMake();
-
-            SizeAdjuster.AdjustAllPenisSizes(pawn,0.0f,0.5f);
-        }
-        
-        public override void PostAdd()
-        {
-            base.PostAdd();
             SizeAdjuster.AdjustAllPenisSizes(pawn, 0.0f, 0.5f);
         }
-
     }
-}
+}

Source/Genes/GenitaliaSize/Gene_TightAnus.cs

@@ -1,21 +1,10 @@
 namespace RJW_Genes
 {
-    public class Gene_TightAnus : RJW_Gene
+    public class Gene_TightAnus : Gene_GenitaliaResizingGene
     {
-
-        public override void PostMake()
+        public override void Resize()
         {
-            base.PostMake();
-
             SizeAdjuster.AdjustAllAnusSizes(pawn, 0.0f, 0.5f);
         }
-        
-        public override void PostAdd()
-        {
-            base.PostAdd();
-            SizeAdjuster.AdjustAllAnusSizes(pawn, 0.0f, 0.5f);
-        }
-
-
     }
-}
+}

Source/Genes/GenitaliaSize/Gene_TightFemaleGenitalia.cs

@@ -1,20 +1,10 @@
 namespace RJW_Genes
 {
-    public class Gene_TightFemaleGenitalia : RJW_Gene
+    public class Gene_TightFemaleGenitalia : Gene_GenitaliaResizingGene
     {
-
-        public override void PostMake()
+        public override void Resize()
         {
-            base.PostMake();
-
             SizeAdjuster.AdjustAllVaginaSizes(pawn, 0.0f, 0.5f);
         }
-        
-        public override void PostAdd()
-        {
-            base.PostAdd();
-            SizeAdjuster.AdjustAllVaginaSizes(pawn, 0.0f, 0.5f);
-        }
-
     }
-}
+}

Source/Genes/GenitaliaSize/Patch_ResizingOnAdulthood.cs

@@ -0,0 +1,30 @@
+using HarmonyLib;
+using Verse;
+
+namespace RJW_Genes
+{
+    /// <summary>
+    /// This Patch adds behavior to all resizing genes: 
+    /// At Age RESIZING_MIN_AGE the Pawns Resizing Genes will trigger again, if not already triggered somewhere else.
+    /// This is meant to allow kids to grow up without resized genitals, and resize later (Fixing #11). 
+    /// </summary>
+    [HarmonyPatch(typeof(Pawn_AgeTracker), "BirthdayBiological")]
+    public class Patch_ResizingOnAdulthood
+    {
+
+        static void Postfix(Pawn ___pawn, int birthdayAge)
+        {
+            if (birthdayAge >= Gene_GenitaliaResizingGene.RESIZING_AGE)
+            {
+                foreach(Gene_GenitaliaResizingGene gene in GeneUtility.GetGenitaliaResizingGenes(___pawn))
+                {
+                    if (!gene.WasApplied)
+                    {
+                        gene.Resize();
+                        gene.WasApplied = true;
+                    }
+                }
+            }
+        }
+    }
+}

Source/Genes/Special/Patch_AgeDrain.cs

@@ -0,0 +1,40 @@
+using HarmonyLib;
+using rjw;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace RJW_Genes.Genes.Special
+{
+    [HarmonyPatch(typeof(SexUtility), "Aftersex")]
+    public static class Patch_AgeDrain
+    {
+
+        const long AGE_TRANSFERED = 120000; // 120k == 2 days
+        // 20 Years * 60 Days / Year * 60k Ticks/Day + 1 for safety
+        const long MINIMUM_AGE = 20 * 60 * 60000 + 1;
+
+        // Comment Below in for debugging, changes years
+        // const long AGE_TRANSFERED = 12000000; 
+        public static void Postfix(SexProps props)
+        {
+            if (props == null || props.pawn == null || props.partner == null || props.partner.IsAnimal() )
+            {
+                return;
+            }
+            if (GeneUtility.IsAgeDrainer(props.pawn))
+            {
+                var pawnAge = props.pawn.ageTracker.AgeBiologicalTicks;
+                //ModLog.Error($"Firing Age Drain \nMinimum Age is \t{MINIMUM_AGE} \nPawn Age is \t{pawnAge} \nTransferred \t{AGE_TRANSFERED}\nResulting in \t{pawnAge - AGE_TRANSFERED}");
+
+                // Make Partner older
+                props.partner.ageTracker.AgeBiologicalTicks += AGE_TRANSFERED;
+                // Make Pawn younger
+                props.pawn.ageTracker.AgeBiologicalTicks = Math.Max(MINIMUM_AGE, (pawnAge - AGE_TRANSFERED));
+            }
+
+        }
+    }
+}

Source/Genes/Special/Patch_OrgasmRush.cs

@@ -5,6 +5,7 @@ using System.Collections.Generic;
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
+using Verse;
 
 namespace RJW_Genes
 {
@@ -14,6 +15,7 @@ namespace RJW_Genes
 	{
 
 		private const float REST_INCREASE = 0.05f;
+		private const float ORGASMS_NEEDED_FOR_SUPERCHARGE = 3.0f;
 
 		public static void Postfix(SexProps props)
 		{
@@ -23,9 +25,37 @@ namespace RJW_Genes
 
 			if (props.pawn.genes != null && props.pawn.genes.HasGene(GeneDefOf.rjw_genes_orgasm_rush))
             {
-				props.pawn.needs.rest.CurLevel += REST_INCREASE;
-            }
+
+				// Pump up Wake-Ness
+				if (props.pawn.needs.rest != null)
+					props.pawn.needs.rest.CurLevel += REST_INCREASE;
+
+				// Add or Update Hediff for Orgasm Rush
+				Hediff rush = GetOrgasmRushHediff(props.pawn);
+				float added_severity = props.orgasms / ORGASMS_NEEDED_FOR_SUPERCHARGE;
+				rush.Severity += added_severity;
+				// Severity should be capped to 1 by the XML logic
+			}
+
+		}
+
+		/// <summary>
+		/// Helps to get the Orgasm Rush Hediff of a Pawn. If it does not exist, one is added. 
+		/// </summary>
+		/// <param name="orgasmed">The pawn that had the orgasm, for which a hediff is looked up or created.</param>
+		/// <returns></returns>
+		public static Hediff GetOrgasmRushHediff(Pawn orgasmed)
+		{
+			Hediff orgasmRushHediff = orgasmed.health.hediffSet.GetFirstHediffOfDef(GeneDefOf.rjw_genes_orgasm_rush_hediff);
+			if (orgasmRushHediff == null)
+			{
+				orgasmRushHediff = HediffMaker.MakeHediff(GeneDefOf.rjw_genes_orgasm_rush_hediff, orgasmed);
+				orgasmRushHediff.Severity = 0;
+				orgasmed.health.AddHediff(orgasmRushHediff);
+			}
+			return orgasmRushHediff;
 		}
 	}
 
+
 }

Source/Genes/Special/Patch_Youth_Fountain.cs

@@ -0,0 +1,44 @@
+using HarmonyLib;
+using rjw;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace RJW_Genes.Genes.Special
+{
+    [HarmonyPatch(typeof(SexUtility), "Aftersex")]
+    public static class Patch_Youth_Fountain
+    {
+
+        const long AGE_REDUCTION = 60000; // 60k == 1 day
+        // 20 Years * 60 Days / Year * 60k Ticks/Day + 1 for safety
+        const long MINIMUM_AGE = 20 * 60 * 60000 + 1;
+
+        // Comment Below in for debugging
+        // const long AGE_REDUCTION = 6000000; // 6000k == 100 days
+        public static void Postfix(SexProps props)
+        {
+            if (props == null || props.pawn == null || props.partner == null || props.partner.IsAnimal())
+            {
+                return;
+            }
+            if (GeneUtility.IsYouthFountain(props.pawn))
+            {
+                var partnerAge = props.partner.ageTracker.AgeBiologicalTicks;
+
+                //ModLog.Error($"Firing Youth Fountain \nMinimum Age is \t{MINIMUM_AGE}\t{ticksToYears(MINIMUM_AGE)}y\nPawn Age is \t{partnerAge}\t{ticksToYears(partnerAge)}y \nTransferred \t {AGE_REDUCTION}\t{ticksToYears(AGE_REDUCTION)}y\nResulting in \t{partnerAge - AGE_REDUCTION}\t{ticksToYears(partnerAge - AGE_REDUCTION)}y");
+
+                props.partner.ageTracker.AgeBiologicalTicks = Math.Max(MINIMUM_AGE, partnerAge - AGE_REDUCTION);
+            }
+
+        }
+
+        private static float ticksToYears(long ticks)
+        {
+            return (ticks / 60000f) / 60f;
+        }
+    }
+
+}