From 0c3af21c3a4516774b5890785fc141da6b8cf385 Mon Sep 17 00:00:00 2001
From: Vegapnk <vegapnk@protonmail.com>
Date: Sun, 15 Jan 2023 21:14:26 +0100
Subject: [PATCH] Really fixed merge conflicts,upsie

---
 Source/GeneDefOf.cs                       | 4 ----
 Source/Genes/Damage/Gene_Unbreakable.cs   | 3 +--
 Source/Genes/GeneUtility.cs               | 9 ---------
 Source/Genes/Life_Force/Gene_LifeForce.cs | 2 +-
 Source/Genes/Special/Patch_OrgasmRush.cs  | 4 ++--
 Source/HediffDefOf.cs                     | 1 +
 Source/Rjw-Genes.csproj                   | 3 ---
 7 files changed, 5 insertions(+), 21 deletions(-)

diff --git a/Source/GeneDefOf.cs b/Source/GeneDefOf.cs
index a1df81a..0ff9274 100644
--- a/Source/GeneDefOf.cs
+++ b/Source/GeneDefOf.cs
@@ -76,9 +76,6 @@ namespace RJW_Genes
 		public static readonly GeneDef rjw_genes_youth_fountain;
 		public static readonly GeneDef rjw_genes_sex_age_drain;
 		public static readonly GeneDef rjw_genes_aphrodisiac_pheromones;
-		public static readonly GeneDef rjw_genes_aphrodisiac_pheromones;
-		public static readonly GeneDef rjw_genes_youth_fountain;
-		public static readonly GeneDef rjw_genes_sex_age_drain;
 
 		// LifeForce
 		public static readonly GeneDef rjw_genes_lifeforce;
@@ -91,6 +88,5 @@ namespace RJW_Genes
 		public static readonly GeneDef rjw_genes_succubus_tail;
 
     	// Others & Non-Genes
-		public static readonly HediffDef rjw_genes_orgasm_rush_hediff;
 	}
 }
diff --git a/Source/Genes/Damage/Gene_Unbreakable.cs b/Source/Genes/Damage/Gene_Unbreakable.cs
index 2ebdad3..578ed8a 100644
--- a/Source/Genes/Damage/Gene_Unbreakable.cs
+++ b/Source/Genes/Damage/Gene_Unbreakable.cs
@@ -1,5 +1,4 @@
-using LicentiaLabs;
-using rjw;
+using rjw;
 using Verse;
 
 namespace RJW_Genes
diff --git a/Source/Genes/GeneUtility.cs b/Source/Genes/GeneUtility.cs
index 7a987fe..3da53e3 100644
--- a/Source/Genes/GeneUtility.cs
+++ b/Source/Genes/GeneUtility.cs
@@ -174,13 +174,6 @@ namespace RJW_Genes
             }
             return pawn.genes.HasGene(GeneDefOf.rjw_genes_unbreakable);
         }
-<<<<<<< HEAD
-
-
-        public static bool HasGenitaliaResizingGenes(Pawn pawn)
-        {
-            return !GetGenitaliaResizingGenes(pawn).NullOrEmpty();
-        }
 
         public static List<Gene_GenitaliaResizingGene> GetGenitaliaResizingGenes(Pawn pawn)
         {
@@ -196,7 +189,5 @@ namespace RJW_Genes
 
             return ResizingGenes;
         }
-=======
->>>>>>> 09157e923d5c4c4cf71d79cb0af665ffd6a7c536
     }
 }
\ No newline at end of file
diff --git a/Source/Genes/Life_Force/Gene_LifeForce.cs b/Source/Genes/Life_Force/Gene_LifeForce.cs
index c5cfa12..5bb73b6 100644
--- a/Source/Genes/Life_Force/Gene_LifeForce.cs
+++ b/Source/Genes/Life_Force/Gene_LifeForce.cs
@@ -24,7 +24,7 @@ namespace RJW_Genes
 				Pawn pawn = this.pawn;
 				
 				return ((pawn != null) ? pawn.ageTracker : null) == null || 
-					((float)this.pawn.ageTracker.AgeBiologicalYears >= this.def.minAgeActive && this.pawn.ageTracker.AgeBiologicalYears >= (RJWSettings.AllowYouthSex ? 13f : 18f));
+					((float)this.pawn.ageTracker.AgeBiologicalYears >= this.def.minAgeActive);
 			}
 		}
 
diff --git a/Source/Genes/Special/Patch_OrgasmRush.cs b/Source/Genes/Special/Patch_OrgasmRush.cs
index fefcb7a..3caaa68 100644
--- a/Source/Genes/Special/Patch_OrgasmRush.cs
+++ b/Source/Genes/Special/Patch_OrgasmRush.cs
@@ -46,10 +46,10 @@ namespace RJW_Genes
 		/// <returns></returns>
 		public static Hediff GetOrgasmRushHediff(Pawn orgasmed)
 		{
-			Hediff orgasmRushHediff = orgasmed.health.hediffSet.GetFirstHediffOfDef(GeneDefOf.rjw_genes_orgasm_rush_hediff);
+			Hediff orgasmRushHediff = orgasmed.health.hediffSet.GetFirstHediffOfDef(HediffDefOf.rjw_genes_orgasm_rush_hediff);
 			if (orgasmRushHediff == null)
 			{
-				orgasmRushHediff = HediffMaker.MakeHediff(GeneDefOf.rjw_genes_orgasm_rush_hediff, orgasmed);
+				orgasmRushHediff = HediffMaker.MakeHediff(HediffDefOf.rjw_genes_orgasm_rush_hediff, orgasmed);
 				orgasmRushHediff.Severity = 0;
 				orgasmed.health.AddHediff(orgasmRushHediff);
 			}
diff --git a/Source/HediffDefOf.cs b/Source/HediffDefOf.cs
index b0425ec..c6581f8 100644
--- a/Source/HediffDefOf.cs
+++ b/Source/HediffDefOf.cs
@@ -14,5 +14,6 @@ namespace RJW_Genes
         public static readonly HediffDef Aphrodisiac_Pheromone;
         public static readonly HediffDef Fertilin_Lost;
         public static readonly HediffDef Succubus_Drained;
+        public static readonly HediffDef rjw_genes_orgasm_rush_hediff;
     }
 }
diff --git a/Source/Rjw-Genes.csproj b/Source/Rjw-Genes.csproj
index df23439..d3bad38 100644
--- a/Source/Rjw-Genes.csproj
+++ b/Source/Rjw-Genes.csproj
@@ -133,9 +133,7 @@
     <Compile Include="Genes\Life_Force\ThinkNode_ConditionalLowLifeForce.cs" />
     <Compile Include="Genes\Life_Force\ThinkNode_ConditionalCritcalLifeForce.cs" />
     <Compile Include="Genes\Life_Force\JobGiver_GetLifeForce.cs" />
-    <Compile Include="Genes\Damage\Gene_Unbreakable.cs" />
     <Compile Include="Genes\Special\Patch_AgeDrain.cs" />
-    <Compile Include="Genes\Special\Patch_Youth_Fountain.cs" />
     <Compile Include="Interactions\CompAbility_SexInteractionRequirements.cs" />
     <Compile Include="Genes\Life_Force\Abilities\CompAbilityEffect_PussyHeal.cs" />
     <Compile Include="Genes\Life_Force\Abilities\CompProperties_AbilityLifeForceCost.cs" />
@@ -152,7 +150,6 @@
     <Compile Include="Genes\RJW_Gene.cs" />
     <Compile Include="Genes\Genitalia\GenitaliaUtility.cs" />
     <Compile Include="Genes\Special\Gene_Aphrodisiac_Pheromones_.cs" />
-    <Compile Include="Genes\Special\Patch_AgeDrain.cs" />
     <Compile Include="Genes\Life_Force\Patch_LifeForce.cs" />
     <Compile Include="Genes\Special\Patch_OrgasmRush.cs" />
     <Compile Include="Genes\Special\Patch_Youth_Fountain.cs" />