diff --git a/CHANGELOG.md b/CHANGELOG.md index 28a4e46..22ede1f 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -6,7 +6,6 @@ Features: - Orgasm Rush got a Hediff - Unbreakable Gene - Age-Transfer and Youth-Fountain per Sex Gene -- Bisexual and Homosexual Genes with Placeholder Icon - Balancing some Genes by changing metabolism and complexity Succubus: @@ -15,8 +14,6 @@ Fixes: - Issue with Breast-Size (#8) fixed by lowercasing breast-match (Shabakur) - Error on Game Load when Licentia Genes are tried to be added to Xenotypes for players without Licentia (#5) -- Futa Gene only triggers if Pawn is not a futa already (#2) -- Genitalia Resizing triggers on 20th Birthday (#11) # 1.0.1 (2022-12-20) diff --git a/Common/Defs/Genes/GeneCategories.xml b/Common/Defs/Genes/GeneCategories.xml index 81208b9..ab92117 100644 --- a/Common/Defs/Genes/GeneCategories.xml +++ b/Common/Defs/Genes/GeneCategories.xml @@ -57,7 +57,7 @@ rjw_genes_special - + 8 diff --git a/Common/Defs/Genes/GeneDefs_GenitaliaSizes.xml b/Common/Defs/Genes/GeneDefs_GenitaliaSizes.xml index cc26c04..89bc7f9 100644 --- a/Common/Defs/Genes/GeneDefs_GenitaliaSizes.xml +++ b/Common/Defs/Genes/GeneDefs_GenitaliaSizes.xml @@ -9,7 +9,7 @@ rjw_genes_big_male_genitalia - Penises of this Xenotype are bigger.(Resizing takes place at 20th Birthday) + Penises of this Xenotype are bigger. Genes/Icons/Small_Male_Genitalia RJW_Genes.Gene_BigMaleGenitalia 751 @@ -21,7 +21,7 @@ rjw_genes_small_male_genitalia - Penises of this Xenotype are smaller. (Resizing takes place at 20th Birthday) + Penises of this Xenotype are smaller. Genes/Icons/Big_Male_Genitalia RJW_Genes.Gene_SmallMaleGenitalia 753 @@ -34,7 +34,7 @@ rjw_genes_loose_female_genitalia - Vaginas of this Xenotype are quite spacy. (Resizing takes place at 20th Birthday) + Vaginas of this Xenotype are quite spacy. Genes/Icons/Loose_Female_Genitalia RJW_Genes.Gene_LooseFemaleGenitalia 754 @@ -46,7 +46,7 @@ rjw_genes_tight_female_genitalia - Vaginas of this Xenotype are pretty tight.(Resizing takes place at 20th Birthday) + Vaginas of this Xenotype are pretty tight. Genes/Icons/Tight_Female_Genitalia RJW_Genes.Gene_TightFemaleGenitalia 756 @@ -59,7 +59,7 @@ rjw_genes_big_breasts - Females of this Xenotype have big honkers.(Resizing takes place at 20th Birthday) + Females of this Xenotype have big honkers. Genes/Icons/Big_Breasts RJW_Genes.Gene_BigBreasts 757 @@ -71,7 +71,7 @@ rjw_genes_small_breasts - Females of this Xenotype have smaller breasts.(Resizing takes place at 20th Birthday) + Females of this Xenotype have smaller breasts. Genes/Icons/Small_Breasts RJW_Genes.Gene_SmallBreasts 759 @@ -84,7 +84,7 @@ rjw_genes_loose_anus - The Anus of this Xenotype is roomy.(Resizing takes place at 20th Birthday) + The Anus of this Xenotype is roomy. Genes/Icons/Loose_Anus RJW_Genes.Gene_LooseAnus 760 @@ -96,7 +96,7 @@ rjw_genes_tight_anus - The anus of this Xenotype is small.(Resizing takes place at 20th Birthday) + The anus of this Xenotype is small. Genes/Icons/Tight_Anus RJW_Genes.Gene_TightAnus 762 diff --git a/Common/Defs/Genes/GeneDefs_Reproduction.xml b/Common/Defs/Genes/GeneDefs_Reproduction.xml index 97fb937..614bb38 100644 --- a/Common/Defs/Genes/GeneDefs_Reproduction.xml +++ b/Common/Defs/Genes/GeneDefs_Reproduction.xml @@ -29,41 +29,4 @@ - - - rjw_genes_homosexual - - Reproduction - This Gene makes you gay. - UI\Ideoligions\Universal\RoundC - 0 - 3 - -
  • - Gay -
    • -     - -
  • rjw_genes_sexual_orientation
    • -     -     - - - rjw_genes_bisexual - - Reproduction - Carriers of this Gene are Bisexual. - UI\Ideoligions\Universal\RoundC - 0 - 4 - -
  • - Bisexual -
    • -     - -
  • rjw_genes_sexual_orientation
    • -     -     - \ No newline at end of file diff --git a/Source/Animal_Inheritance/RaceGeneDef_Helper.cs b/Source/Animal_Inheritance/RaceGeneDef_Helper.cs index 3db664c..680b155 100644 --- a/Source/Animal_Inheritance/RaceGeneDef_Helper.cs +++ b/Source/Animal_Inheritance/RaceGeneDef_Helper.cs @@ -1,8 +1,11 @@ -using rjw; -using System; +using System; using System.Collections.Generic; using System.Linq; +using System.Text; +using System.Threading.Tasks; +using rjw; using Verse; +using RimWorld; namespace RJW_BGS { @@ -41,7 +44,6 @@ namespace RJW_BGS }).ToList(); if (pawnKindDefs.Count() > 0) return pawnKindDefs; - List raceKindDefs = allDefs.Where(delegate (RaceGeneDef group) { List raceNames = group.raceNames; @@ -49,7 +51,6 @@ namespace RJW_BGS }).ToList(); if (raceKindDefs.Count() > 0) return raceKindDefs; - List raceGroupDefs = new List(); if (raceGroupDef != null) { @@ -59,10 +60,8 @@ namespace RJW_BGS return raceGroupDefName != null && raceGroupDefName == raceGroupDef.defName; }).ToList(); } - if (raceGroupDefs.Count() > 0) return raceGroupDefs; - return new List(); } } diff --git a/Source/Common/ModLog.cs b/Source/Common/ModLog.cs deleted file mode 100644 index 407520a..0000000 --- a/Source/Common/ModLog.cs +++ /dev/null @@ -1,34 +0,0 @@ -using Verse; - -namespace RJW_Genes -{ - internal class ModLog - { - public static string ModId => "RJW-Genes"; - - /// - /// Logs the given message with [SaveStorage.ModId] appended. - /// - public static void Error(string message) - { - Log.Error($"[{ModId}] {message}"); - } - - /// - /// Logs the given message with [SaveStorage.ModId] appended. - /// - public static void Message(string message) - { - Log.Message($"[{ModId}] {message}"); - } - - /// - /// Logs the given message with [SaveStorage.ModId] appended. - /// - public static void Warning(string message) - { - Log.Warning($"[{ModId}] {message}"); - } - - } -} diff --git a/Source/GeneDefOf.cs b/Source/GeneDefOf.cs index 6b13cfb..d2130af 100644 --- a/Source/GeneDefOf.cs +++ b/Source/GeneDefOf.cs @@ -51,7 +51,6 @@ namespace RJW_Genes public static readonly GeneDef rjw_genes_mechbreeder; public static readonly GeneDef rjw_genes_insectincubator; public static readonly GeneDef rjw_genes_insectbreeder; - public static readonly GeneDef rjw_genes_zoophile; // Cum public static readonly GeneDef rjw_genes_no_cum; @@ -64,8 +63,7 @@ namespace RJW_Genes // Reproduction public static readonly GeneDef rjw_genes_hypersexual; public static readonly GeneDef rjw_genes_rapist; - public static readonly GeneDef rjw_genes_homosexual; - public static readonly GeneDef rjw_genes_bisexual; + public static readonly GeneDef rjw_genes_zoophile; // Damage & Side Effects [MayRequire("LustLicentia.RJWLabs")] public static readonly GeneDef rjw_genes_elasticity; diff --git a/Source/Genes/ExtraGenitalia/Gene_Futa.cs b/Source/Genes/ExtraGenitalia/Gene_Futa.cs index 812f381..2d9f367 100644 --- a/Source/Genes/ExtraGenitalia/Gene_Futa.cs +++ b/Source/Genes/ExtraGenitalia/Gene_Futa.cs @@ -13,12 +13,6 @@ 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(); @@ -33,12 +27,6 @@ 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(); @@ -91,15 +79,5 @@ 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) ; - } } } diff --git a/Source/Genes/GeneUtility.cs b/Source/Genes/GeneUtility.cs index 284aab2..07a5c24 100644 --- a/Source/Genes/GeneUtility.cs +++ b/Source/Genes/GeneUtility.cs @@ -1,5 +1,4 @@ using System; -using System.Collections.Generic; using Verse; namespace RJW_Genes @@ -33,7 +32,7 @@ namespace RJW_Genes return pawn.genes.HasGene(GeneDefOf.rjw_genes_youth_fountain); } - public static bool IsAgeDrainer(Pawn pawn) + internal static bool IsAgeDrainer(Pawn pawn) { if (pawn.genes == null) { @@ -96,25 +95,5 @@ namespace RJW_Genes return pawn.genes.HasGene(GeneDefOf.rjw_genes_unbreakable); } - - public static bool HasGenitaliaResizingGenes(Pawn pawn) - { - return !GetGenitaliaResizingGenes(pawn).NullOrEmpty(); - } - - public static List GetGenitaliaResizingGenes(Pawn pawn) - { - var ResizingGenes = new List(); - - // 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; - } } } \ No newline at end of file diff --git a/Source/Genes/GenitaliaSize/Gene_BigBreasts.cs b/Source/Genes/GenitaliaSize/Gene_BigBreasts.cs index b1c6e4f..b0e61ad 100644 --- a/Source/Genes/GenitaliaSize/Gene_BigBreasts.cs +++ b/Source/Genes/GenitaliaSize/Gene_BigBreasts.cs @@ -1,12 +1,24 @@ using Verse; namespace RJW_Genes { - public class Gene_BigBreasts : Gene_GenitaliaResizingGene + public class Gene_BigBreasts : RJW_Gene { - public override void Resize() + + public override void PostMake() { + 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); } + + } -} \ No newline at end of file +} diff --git a/Source/Genes/GenitaliaSize/Gene_BigMaleGenitalia.cs b/Source/Genes/GenitaliaSize/Gene_BigMaleGenitalia.cs index 8cee1ef..b04df46 100644 --- a/Source/Genes/GenitaliaSize/Gene_BigMaleGenitalia.cs +++ b/Source/Genes/GenitaliaSize/Gene_BigMaleGenitalia.cs @@ -1,10 +1,20 @@ namespace RJW_Genes { - public class Gene_BigMaleGenitalia : Gene_GenitaliaResizingGene + public class Gene_BigMaleGenitalia : RJW_Gene { - public override void Resize() + + public override void PostMake() { + base.PostMake(); + + SizeAdjuster.AdjustAllPenisSizes(pawn,0.5f,1.0f); + } + + public override void PostAdd() + { + base.PostAdd(); SizeAdjuster.AdjustAllPenisSizes(pawn, 0.5f, 1.0f); } + } -} \ No newline at end of file +} diff --git a/Source/Genes/GenitaliaSize/Gene_GenitaliaResizingGene.cs b/Source/Genes/GenitaliaSize/Gene_GenitaliaResizingGene.cs deleted file mode 100644 index ee24126..0000000 --- a/Source/Genes/GenitaliaSize/Gene_GenitaliaResizingGene.cs +++ /dev/null @@ -1,49 +0,0 @@ -namespace RJW_Genes -{ - /// - /// 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) - /// - 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; - } - } - - /// - /// 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. - /// - public abstract void Resize(); - - } -} \ No newline at end of file diff --git a/Source/Genes/GenitaliaSize/Gene_LooseAnus.cs b/Source/Genes/GenitaliaSize/Gene_LooseAnus.cs index 520eb5a..f5a5312 100644 --- a/Source/Genes/GenitaliaSize/Gene_LooseAnus.cs +++ b/Source/Genes/GenitaliaSize/Gene_LooseAnus.cs @@ -1,12 +1,22 @@ -using Verse; - -namespace RJW_Genes +namespace RJW_Genes { - public class Gene_LooseAnus : Gene_GenitaliaResizingGene + public class Gene_LooseAnus : RJW_Gene { - public override void Resize() + + public override void PostMake() { + base.PostMake(); + SizeAdjuster.AdjustAllAnusSizes(pawn, 0.5f, 1.0f); } + + public override void PostAdd() + { + base.PostAdd(); + SizeAdjuster.AdjustAllAnusSizes(pawn, 0.5f, 1.0f); + } + + + } } diff --git a/Source/Genes/GenitaliaSize/Gene_LooseFemaleGenitalia.cs b/Source/Genes/GenitaliaSize/Gene_LooseFemaleGenitalia.cs index 2885c07..68578b6 100644 --- a/Source/Genes/GenitaliaSize/Gene_LooseFemaleGenitalia.cs +++ b/Source/Genes/GenitaliaSize/Gene_LooseFemaleGenitalia.cs @@ -1,12 +1,22 @@ -using Verse; - -namespace RJW_Genes +namespace RJW_Genes { - public class Gene_LooseFemaleGenitalia : Gene_GenitaliaResizingGene + public class Gene_LooseFemaleGenitalia : RJW_Gene { - public override void Resize() + + public override void PostMake() { + base.PostMake(); + SizeAdjuster.AdjustAllVaginaSizes(pawn, 0.5f, 1.0f); } + + public override void PostAdd() + { + base.PostAdd(); + SizeAdjuster.AdjustAllVaginaSizes(pawn, 0.5f, 1.0f); + } + + + } } diff --git a/Source/Genes/GenitaliaSize/Gene_SmallBreasts.cs b/Source/Genes/GenitaliaSize/Gene_SmallBreasts.cs index 2e8af43..d5b4a4e 100644 --- a/Source/Genes/GenitaliaSize/Gene_SmallBreasts.cs +++ b/Source/Genes/GenitaliaSize/Gene_SmallBreasts.cs @@ -1,11 +1,18 @@ -using Verse; - -namespace RJW_Genes +namespace RJW_Genes { - public class Gene_SmallBreasts : Gene_GenitaliaResizingGene + public class Gene_SmallBreasts : RJW_Gene { - public override void Resize() + + public override void PostMake() { + base.PostMake(); + + SizeAdjuster.AdjustAllBreastSizes(pawn, 0.0f, 0.5f); + } + + public override void PostAdd() + { + base.PostAdd(); SizeAdjuster.AdjustAllBreastSizes(pawn, 0.0f, 0.5f); } } diff --git a/Source/Genes/GenitaliaSize/Gene_SmallMaleGenitalia.cs b/Source/Genes/GenitaliaSize/Gene_SmallMaleGenitalia.cs index ce5d33a..12ba154 100644 --- a/Source/Genes/GenitaliaSize/Gene_SmallMaleGenitalia.cs +++ b/Source/Genes/GenitaliaSize/Gene_SmallMaleGenitalia.cs @@ -1,10 +1,20 @@ namespace RJW_Genes { - public class Gene_SmallMaleGenitalia : Gene_GenitaliaResizingGene + public class Gene_SmallMaleGenitalia : RJW_Gene { - public override void Resize() + + public override void PostMake() { + base.PostMake(); + + SizeAdjuster.AdjustAllPenisSizes(pawn,0.0f,0.5f); + } + + public override void PostAdd() + { + base.PostAdd(); SizeAdjuster.AdjustAllPenisSizes(pawn, 0.0f, 0.5f); } + } -} \ No newline at end of file +} diff --git a/Source/Genes/GenitaliaSize/Gene_TightAnus.cs b/Source/Genes/GenitaliaSize/Gene_TightAnus.cs index 443aba7..56f52cd 100644 --- a/Source/Genes/GenitaliaSize/Gene_TightAnus.cs +++ b/Source/Genes/GenitaliaSize/Gene_TightAnus.cs @@ -1,10 +1,21 @@ namespace RJW_Genes { - public class Gene_TightAnus : Gene_GenitaliaResizingGene + public class Gene_TightAnus : RJW_Gene { - public override void Resize() + + public override void PostMake() { + base.PostMake(); + SizeAdjuster.AdjustAllAnusSizes(pawn, 0.0f, 0.5f); } + + public override void PostAdd() + { + base.PostAdd(); + SizeAdjuster.AdjustAllAnusSizes(pawn, 0.0f, 0.5f); + } + + } -} \ No newline at end of file +} diff --git a/Source/Genes/GenitaliaSize/Gene_TightFemaleGenitalia.cs b/Source/Genes/GenitaliaSize/Gene_TightFemaleGenitalia.cs index 306635d..53ec2a7 100644 --- a/Source/Genes/GenitaliaSize/Gene_TightFemaleGenitalia.cs +++ b/Source/Genes/GenitaliaSize/Gene_TightFemaleGenitalia.cs @@ -1,10 +1,20 @@ namespace RJW_Genes { - public class Gene_TightFemaleGenitalia : Gene_GenitaliaResizingGene + public class Gene_TightFemaleGenitalia : RJW_Gene { - public override void Resize() + + public override void PostMake() { + base.PostMake(); + SizeAdjuster.AdjustAllVaginaSizes(pawn, 0.0f, 0.5f); } + + public override void PostAdd() + { + base.PostAdd(); + SizeAdjuster.AdjustAllVaginaSizes(pawn, 0.0f, 0.5f); + } + } -} \ No newline at end of file +} diff --git a/Source/Genes/GenitaliaSize/Patch_ResizingOnAdulthood.cs b/Source/Genes/GenitaliaSize/Patch_ResizingOnAdulthood.cs deleted file mode 100644 index b8542a0..0000000 --- a/Source/Genes/GenitaliaSize/Patch_ResizingOnAdulthood.cs +++ /dev/null @@ -1,30 +0,0 @@ -using HarmonyLib; -using Verse; - -namespace RJW_Genes -{ - /// - /// 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). - /// - [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; - } - } - } - } - } -} \ No newline at end of file diff --git a/Source/Genes/Special/Patch_AgeDrain.cs b/Source/Genes/Special/Patch_AgeDrain.cs index 2c7e55d..981f483 100644 --- a/Source/Genes/Special/Patch_AgeDrain.cs +++ b/Source/Genes/Special/Patch_AgeDrain.cs @@ -13,11 +13,9 @@ namespace RJW_Genes.Genes.Special { 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; + // const long AGE_TRANSFERED = 6000000; // 6000k == 100 days public static void Postfix(SexProps props) { if (props == null || props.pawn == null || props.partner == null || props.partner.IsAnimal() ) @@ -27,12 +25,12 @@ namespace RJW_Genes.Genes.Special 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}"); + var pawnMinAge = props.pawn.ageTracker.AdultMinAgeTicks; // Make Partner older props.partner.ageTracker.AgeBiologicalTicks += AGE_TRANSFERED; // Make Pawn younger - props.pawn.ageTracker.AgeBiologicalTicks = Math.Max(MINIMUM_AGE, (pawnAge - AGE_TRANSFERED)); + props.pawn.ageTracker.AgeBiologicalTicks = Math.Max(pawnMinAge, pawnAge - AGE_TRANSFERED); } } diff --git a/Source/Genes/Special/Patch_Youth_Fountain.cs b/Source/Genes/Special/Patch_Youth_Fountain.cs index a1a1840..f2c7e13 100644 --- a/Source/Genes/Special/Patch_Youth_Fountain.cs +++ b/Source/Genes/Special/Patch_Youth_Fountain.cs @@ -13,11 +13,9 @@ namespace RJW_Genes.Genes.Special { 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 + //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()) @@ -27,18 +25,12 @@ namespace RJW_Genes.Genes.Special if (GeneUtility.IsYouthFountain(props.pawn)) { var partnerAge = props.partner.ageTracker.AgeBiologicalTicks; + var minAge = props.partner.ageTracker.AdultMinAgeTicks; - //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); + props.partner.ageTracker.AgeBiologicalTicks = Math.Max(minAge, partnerAge - AGE_REDUCTION); } } - private static float ticksToYears(long ticks) - { - return (ticks / 60000f) / 60f; - } } - }