From c90c9e2c0265f5250fcb6ad9ee96ce60f52a49a9 Mon Sep 17 00:00:00 2001
From: Vegapnk <vegapnk@protonmail.com>
Date: Wed, 3 Jul 2024 10:20:57 +0200
Subject: [PATCH] Removed the DiseaseGene

---
 Common/Defs/GeneDefs/GeneDefs_Diseases.xml         |  8 +-------
 Source/Genes/Diseases/Genes/DiseaseGene.cs         | 14 --------------
 ...atch_AftersexUtility_TransferGeneticDiseases.cs |  4 +++-
 Source/Rjw-Genes.csproj                            |  2 +-
 4 files changed, 5 insertions(+), 23 deletions(-)
 delete mode 100644 Source/Genes/Diseases/Genes/DiseaseGene.cs

diff --git a/Common/Defs/GeneDefs/GeneDefs_Diseases.xml b/Common/Defs/GeneDefs/GeneDefs_Diseases.xml
index e4fead1..7b5cbe8 100644
--- a/Common/Defs/GeneDefs/GeneDefs_Diseases.xml
+++ b/Common/Defs/GeneDefs/GeneDefs_Diseases.xml
@@ -2,12 +2,9 @@
 <Defs>
 
     <GeneDef>
-        
 		<displayCategory>rjw_genes_diseases</displayCategory>
         <defName>rjw_genes_genetic_disease_immunity</defName>
-
         <displayOrderInCategory>1</displayOrderInCategory>
-
         <label>genetic disease immunity</label>
         <description>This gene makes the pawn immune against genetic STDs and other genes that imply negative side-effects. </description>
         <biostatCpx>2</biostatCpx>
@@ -17,15 +14,12 @@
                 Class="VanillaGenesExpanded.GeneExtension">
                 <backgroundPathEndogenes>Genes/Icons/RJW_Genes_Endogene_Background</backgroundPathEndogenes>
                 <backgroundPathXenogenes>Genes/Icons/RJW_Genes_Xenogene_Background</backgroundPathXenogenes>
-            </li>
+        </li>
     </GeneDef>
 
 	<GeneDef>
 		<displayCategory>rjw_genes_diseases</displayCategory>
         <defName>rjw_genes_minor_vulnerability</defName>
-
-        <geneClass>RJW_Genes.DiseaseGene</geneClass>
-
         <label>minor vulnerability</label>
         <description>This gene makes the pawn more vulnerable, and a more attractive target for rape. </description>
         <biostatCpx>2</biostatCpx>
diff --git a/Source/Genes/Diseases/Genes/DiseaseGene.cs b/Source/Genes/Diseases/Genes/DiseaseGene.cs
deleted file mode 100644
index deba64f..0000000
--- a/Source/Genes/Diseases/Genes/DiseaseGene.cs
+++ /dev/null
@@ -1,14 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using Verse;
-
-namespace RJW_Genes
-{
-    public class DiseaseGene : Gene
-    {
-
-    }
-}
diff --git a/Source/Genes/Diseases/Patches/Patch_AftersexUtility_TransferGeneticDiseases.cs b/Source/Genes/Diseases/Patches/Patch_AftersexUtility_TransferGeneticDiseases.cs
index 8ddb6be..d7a2e07 100644
--- a/Source/Genes/Diseases/Patches/Patch_AftersexUtility_TransferGeneticDiseases.cs
+++ b/Source/Genes/Diseases/Patches/Patch_AftersexUtility_TransferGeneticDiseases.cs
@@ -87,7 +87,9 @@ namespace RJW_Genes.Genes.Diseases.Patches
 
         private static bool IsGeneticDiseaseGene(GeneDef geneDef)
         {
-            return geneDef.geneClass.FullName.Contains("DiseaseGene");
+            if (geneDef == null) return false;
+            GeneticDiseaseExtension diseaseExt = geneDef.GetModExtension<GeneticDiseaseExtension>();
+            return diseaseExt != null;
         }
 
         private static float LookupDiseaseInfectionChance(GeneDef geneDef)
diff --git a/Source/Rjw-Genes.csproj b/Source/Rjw-Genes.csproj
index 0abf68c..cf56f5b 100644
--- a/Source/Rjw-Genes.csproj
+++ b/Source/Rjw-Genes.csproj
@@ -75,7 +75,6 @@
     <Compile Include="Genes\Cum\Patch_LikesCumflation.cs" />
     <Compile Include="Genes\Damage\Gene_Elasticity.cs" />
     <Compile Include="Genes\Diseases\Defs\GeneticDiseaseExtension.cs" />
-    <Compile Include="Genes\Diseases\Genes\DiseaseGene.cs" />
     <Compile Include="Genes\Diseases\Patches\Patch_AftersexUtility_TransferGeneticDiseases.cs" />
     <Compile Include="Genes\Life_Force\Events\SuccubusVisit\IncidentWorker_SuccubusVisit.cs" />
     <Compile Include="Genes\Life_Force\Events\SuccubusVisit\LordJob_SuccubusVisit.cs" />
@@ -241,6 +240,7 @@
     </Reference>
   </ItemGroup>
   <ItemGroup>
+    <Folder Include="Genes\Diseases\Genes\" />
     <Folder Include="Genes\Gender\Patches\" />
   </ItemGroup>
   <ItemGroup>