CHANGELOG.md

@@ -1,14 +1,9 @@
-<<<<<<< HEAD
 # 1.1.4 
 
 Fixes:
 
-- Youth Fountain and Age Drainer **really** "stop" at 18 (#26, #28) and never age pawns
 - Drastically reduced vomiting time due to an missunderstanding (#29). `0.4` instead of `0.01`
 
-Sometimes life is like that, and you have to fix the fixes. 
-It was never really broken, life is just very long. 
-
 # 1.1.3
 
 Changes:

Source/Genes/Special/Patch_AgeDrain.cs

@@ -15,13 +15,17 @@ namespace RJW_Genes.Genes.Special
          * Update Issue #26: 
          * There are options that a 16 yo pawn and a 16 yo pawn have sex, 
          * or there are races that have a different age-limits. 
-         * I am not sure how I feel about this, but as some people that I consider "normal" asked me about this I changed it as requested in #26 and #28
+         * I don't want to account for "trust me this race is really adult with Age 6!!!"-stuff.
+         * As it is somewhat a bug when the pawns age tho, I added that the youth-fountain also needs to have MIN_AGE. 
+         * If you'd like a different behaviour, you have to do it yourself. 
          */
 
         const long AGE_TRANSFERED = 120000; // 120k == 2 days
         // 18 Years * 60 Days / Year * 60k Ticks/Day + 1 for safety
         const long MINIMUM_AGE = 18 * 60 * 60000 + 1;
 
+        // Comment AGE_TRANSFERED 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() )
@@ -35,9 +39,8 @@ namespace RJW_Genes.Genes.Special
 
                 // Make Partner older
                 props.partner.ageTracker.AgeBiologicalTicks += AGE_TRANSFERED;
-                // Make Pawn younger if he is older than minimum age
-                if (pawnAge - AGE_TRANSFERED > MINIMUM_AGE)
-                    props.pawn.ageTracker.AgeBiologicalTicks = Math.Max(MINIMUM_AGE, (pawnAge - AGE_TRANSFERED));
+                // Make Pawn younger
+                props.pawn.ageTracker.AgeBiologicalTicks = Math.Max(MINIMUM_AGE, (pawnAge - AGE_TRANSFERED));
             }
 
         }

Source/Genes/Special/Patch_Youth_Fountain.cs

@@ -15,13 +15,18 @@ namespace RJW_Genes.Genes.Special
          * Update Issue #26: 
          * There are options that a 16 yo pawn and a 16 yo pawn have sex, 
          * or there are races that have a different age-limits. 
-         * I am not sure how I feel about this, but as some people that I consider "normal" asked me about this I changed it as requested in #26 and #28
+         * I don't want to account for "trust me this race is really adult with Age 6!!!"-stuff.
+         * As it is somewhat a bug when the pawns age tho, I added that the youth-fountain also needs to have MIN_AGE. 
+         * If you'd like a different behaviour, you have to do it yourself. 
          */
 
+
         const long AGE_REDUCTION = 60000; // 60k == 1 day
         // 18 Years * 60 Days / Year * 60k Ticks/Day + 1 for safety
         const long MINIMUM_AGE = 18 * 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())
@@ -32,12 +37,15 @@ namespace RJW_Genes.Genes.Special
             {
                 var partnerAge = props.partner.ageTracker.AgeBiologicalTicks;
 
-                if(partnerAge - AGE_REDUCTION > MINIMUM_AGE)
-                    props.partner.ageTracker.AgeBiologicalTicks = Math.Max(MINIMUM_AGE, partnerAge - AGE_REDUCTION);
+                props.partner.ageTracker.AgeBiologicalTicks = Math.Max(MINIMUM_AGE, partnerAge - AGE_REDUCTION);
             }
 
         }
 
+        private static float ticksToYears(long ticks)
+        {
+            return (ticks / 60000f) / 60f;
+        }
     }
 
 }

TODOS.md

@@ -22,8 +22,6 @@ Any help is very appreciated, even if it is just pointing me to existing similar
 
 **Death-Rest** until the pawn is cumflated. 
 
-**Alpha / Beta Genes** that you can only have one alpha, and the alpha makes mostly beta children (1:10). This might fit with the xenotypes below. As this is an RJW mod, this should also somewhat affect sex (e.g. betas cannot impregnate betas). 
-
 ## Planned Xenotypes 
 
 **Beastmaster:**