From 132344b294235511fb41ce536a22598826df606a Mon Sep 17 00:00:00 2001
From: Vegapnk <vegapnk@protonmail.com>
Date: Mon, 17 Jul 2023 07:09:05 +0200
Subject: [PATCH] LifeForceEmpath uses new XML DefModExtension

---
 Common/Defs/GeneDefs/GeneDefs_LifeForce.xml            | 10 ++++++++--
 Source/Common/Defs/DistanceExtension.cs                |  4 ++--
 Source/Common/Defs/ModExtensionHelper.cs               |  2 +-
 .../Genes/Life_Force/Defs/LifeForceEmpathExtension.cs  |  3 ---
 Source/Genes/Life_Force/Genes/Gene_LifeForce_Empath.cs |  4 ++--
 Source/Rjw-Genes.csproj                                |  3 +++
 6 files changed, 16 insertions(+), 10 deletions(-)

diff --git a/Common/Defs/GeneDefs/GeneDefs_LifeForce.xml b/Common/Defs/GeneDefs/GeneDefs_LifeForce.xml
index 720a236..2f69cb1 100644
--- a/Common/Defs/GeneDefs/GeneDefs_LifeForce.xml
+++ b/Common/Defs/GeneDefs/GeneDefs_LifeForce.xml
@@ -274,13 +274,19 @@
 				<backgroundPathXenogenes>Genes/Icons/RJW_Genes_Xenogene_Background</backgroundPathXenogenes>
 			</li>
 			<li Class="RJW_Genes.LifeForceEmpathExtension">
-				<!-- One day has 60k ticks, so we check every hour with 60000/24 = 2500-->
-				<tickInterval>2500</tickInterval>
 				<empathDistance>25</empathDistance>
 				<aheagoIncrement>0.02</aheagoIncrement>
 				<satisfactionIncrement>0.01</satisfactionIncrement>
 				<frustratedDecrement>-0.01</frustratedDecrement>
 			</li>
+			<li Class="RJW_Genes.TickIntervalExtension">
+				<!-- One day has 60k ticks, so we check every hour with 60000/24 = 2500-->
+				<tickInterval>2500</tickInterval>
+			</li>
+			<li Class="RJW_Genes.DistanceExtension">
+				<!-- distance 25 means 25 tiles in every direction from the empath.-->
+				<distance>25</distance>
+			</li>
 		</modExtensions>
 	</GeneDef>
 
diff --git a/Source/Common/Defs/DistanceExtension.cs b/Source/Common/Defs/DistanceExtension.cs
index 48d82e6..8bdd083 100644
--- a/Source/Common/Defs/DistanceExtension.cs
+++ b/Source/Common/Defs/DistanceExtension.cs
@@ -15,6 +15,6 @@ namespace RJW_Genes
     /// </summary>
     public class DistanceExtension : DefModExtension
     {
-        public int Distance;
+        public int distance;
     }
-}
+}
\ No newline at end of file
diff --git a/Source/Common/Defs/ModExtensionHelper.cs b/Source/Common/Defs/ModExtensionHelper.cs
index e8fc545..d75fc12 100644
--- a/Source/Common/Defs/ModExtensionHelper.cs
+++ b/Source/Common/Defs/ModExtensionHelper.cs
@@ -14,7 +14,7 @@ namespace RJW_Genes
         {
             DistanceExtension distanceExt = defOf.GetModExtension<DistanceExtension>();
 
-            int potentialDistance = distanceExt?.Distance ?? fallback;
+            int potentialDistance = distanceExt?.distance ?? fallback;
 
             if (potentialDistance > 0)
             {
diff --git a/Source/Genes/Life_Force/Defs/LifeForceEmpathExtension.cs b/Source/Genes/Life_Force/Defs/LifeForceEmpathExtension.cs
index 1c5170d..ccc037b 100644
--- a/Source/Genes/Life_Force/Defs/LifeForceEmpathExtension.cs
+++ b/Source/Genes/Life_Force/Defs/LifeForceEmpathExtension.cs
@@ -9,9 +9,6 @@ namespace RJW_Genes
 {
     public class LifeForceEmpathExtension : DefModExtension
     {
-        public int tickInterval;
-        public int empathDistance;
-
         public float aheagoIncrement;
         public float satisfactionIncrement;
         public float frustratedDecrement;
diff --git a/Source/Genes/Life_Force/Genes/Gene_LifeForce_Empath.cs b/Source/Genes/Life_Force/Genes/Gene_LifeForce_Empath.cs
index 69410ed..2fec1a7 100644
--- a/Source/Genes/Life_Force/Genes/Gene_LifeForce_Empath.cs
+++ b/Source/Genes/Life_Force/Genes/Gene_LifeForce_Empath.cs
@@ -29,8 +29,8 @@ namespace RJW_Genes
         {
             LifeForceEmpathExtension empathExt = GeneDefOf.rjw_genes_lifeforce_empath.GetModExtension<LifeForceEmpathExtension>();
 
-            tickInterval = empathExt?.tickInterval ?? TICK_INTERVAL_FALLBACK;
-            empathDistance = empathExt?.empathDistance ?? EMPATH_DISTANCE_FALLBACK;
+            tickInterval =  ModExtensionHelper.GetTickIntervalFromModExtension(GeneDefOf.rjw_genes_lifeforce_empath, TICK_INTERVAL_FALLBACK);
+            empathDistance = ModExtensionHelper.GetTickIntervalFromModExtension(GeneDefOf.rjw_genes_lifeforce_empath, EMPATH_DISTANCE_FALLBACK);
 
             aheagoIncrement = empathExt?.aheagoIncrement ?? AHEAGO_FALLBACK;
             satisfiedIncrement = empathExt?.satisfactionIncrement ?? SATISFIED_FALLBACK;
diff --git a/Source/Rjw-Genes.csproj b/Source/Rjw-Genes.csproj
index b8fa287..e975194 100644
--- a/Source/Rjw-Genes.csproj
+++ b/Source/Rjw-Genes.csproj
@@ -39,7 +39,10 @@
     <Compile Include="Animal_Inheritance\Settings\RJW_BGSSettings.cs" />
     <Compile Include="Animal_Inheritance\Settings\RJW_BGSSettingsController.cs" />
     <Compile Include="Animal_Inheritance\Defs\BestialityGeneInheritanceDef.cs" />
+    <Compile Include="Common\Defs\DistanceExtension.cs" />
+    <Compile Include="Common\Defs\ModExtensionHelper.cs" />
     <Compile Include="Common\ModLog.cs" />
+    <Compile Include="Common\Defs\TickIntervalExtension.cs" />
     <Compile Include="GeneDefOf.cs" />
     <Compile Include="Genes\Breeding\Gene_MechBreeder.cs" />
     <Compile Include="Genes\Breeding\PatchMechBirth.cs" />