Merge 2.6.2 Update (#228)

* - Seperation of Animal Gene code from base RJW_Genes

* - Clean-up of leftover XML Files
- Minor update to README.md

* Fixed missing translation text
Fixed Missing B&S Undead Patch
Fixed Anal Fertility Errors, might be broken again.

DLL Included for Merge.

.gitignore

@@ -255,3 +255,5 @@ paket-files/
 # Python Tools for Visual Studio (PTVS)
 __pycache__/
 *.pyc
+
+*.dds

1.5/Mods/RaceSupport/Defs/GeneDefs/GeneDefs_GenitaliaTypesRace.xml

@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Defs>
+
+  <GeneDef ParentName="GeneGenitalTypeBase">
+    <defName>rjw_genes_Pig_genitalia</defName>
+    <label>Pig genitalia</label>
+    <description>Carriers of this gene develop pig genitalia.</description>
+    <iconPath>Genes/Icons/Genitalia_screw_icon</iconPath>
+    <modExtensions>
+      <li Class="RJW_Genes.GenitaliaTypeExtension">
+        <penis>PigPenis</penis>
+        <vagina>PigVagina</vagina>
+      </li>
+    </modExtensions>
+    <displayOrderInCategory>807</displayOrderInCategory>
+  </GeneDef>
+
+  <GeneDef ParentName="GeneGenitalTypeBase">
+    <defName>rjw_genes_Orc_genitalia</defName>
+    <label>Orc genitalia</label>
+    <description>Carriers of this gene develop orc genitalia.</description>
+    <iconPath>Genes/Icons/Genitalia_orc_icon</iconPath>
+    <modExtensions>
+      <li Class="RJW_Genes.GenitaliaTypeExtension">
+        <penis>OrcPenis</penis>
+        <vagina>OrcVagina</vagina>
+      </li>
+    </modExtensions>
+    <displayOrderInCategory>807</displayOrderInCategory>
+  </GeneDef>
+
+</Defs>

1.5/Source/Genes/Breeding/Patches/PatchMechBirth.cs

@@ -1,17 +1,14 @@
 
 
-using System;
 using System.Collections.Generic;
 using System.Reflection;
 using System.Reflection.Emit;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 using HarmonyLib;
 using rjw;
+using Verse;
 
 namespace RJW_Genes
-{
+{
     /// <summary>
     /// This Class patches the RJW-Mechbirth to not deal damage when the pawn has the MechBreeder Gene.
     /// This harmony patch was kindly provided by 'shabalox' https://github.com/Shabalox/RJW_Genes_Addons/
@@ -22,43 +19,36 @@ namespace RJW_Genes
         [HarmonyTranspiler]
         public static IEnumerable<CodeInstruction> Transpiler(IEnumerable<CodeInstruction> instructions, ILGenerator il)
         {
-            bool found_call = false;
+            bool found_call = false;
-            bool found_skip = false;
+            bool finished = false;
-            Label skip_label = il.DefineLabel();
+            Label skip_label = il.DefineLabel();
-            MethodInfo ismechbreeder = AccessTools.Method(typeof(GeneUtility), "IsMechbreeder");
+            MethodInfo removeHediff = AccessTools.Method(typeof(Pawn_HealthTracker), nameof(Pawn_HealthTracker.RemoveHediff));
-            foreach (CodeInstruction codeInstruction in instructions)
+            MethodInfo ismechbreeder = AccessTools.Method(typeof(GeneUtility), "IsMechbreeder");
-            {
+            foreach (CodeInstruction codeInstruction in instructions)
-                //Check if the first opcode after endfinally ldloc_0 is and in that case add the label to skip the code
+            {
-                if (found_skip && codeInstruction.opcode == OpCodes.Ldloc_0)
+                yield return codeInstruction;
-                {
+
-                    codeInstruction.labels.Add(skip_label);
+                if (finished)
-                }
+                {
-                found_skip = false;
+                    continue;
-                if (codeInstruction.opcode == OpCodes.Endfinally)
+                }
-                {
+
-                    found_skip = true;
+                if (!found_call && codeInstruction.Calls(removeHediff))
-                }
+                {
-
+                    //Load pawn, call function to check if a mechbreeder, and skip past the part which does damage
-                yield return codeInstruction;
+                    yield return new CodeInstruction(OpCodes.Ldloc_0);
-
+                    yield return new CodeInstruction(OpCodes.Call, ismechbreeder);
-                if (codeInstruction.opcode == OpCodes.Call)
+                    yield return new CodeInstruction(OpCodes.Brfalse_S, skip_label);
-                {
+                    yield return new CodeInstruction(OpCodes.Ret);
-                    if (codeInstruction.operand.ToString() == "Boolean TryMakeFilth(Verse.IntVec3, Verse.Map, Verse.ThingDef, System.String, Int32, RimWorld.FilthSourceFlags)")
+                    found_call = true;
-                    {
+                }
-                        found_call = true;
+                else if (found_call)
-                    }
+                {
-                }
+                    // next instruction after the insert
-                //Triggers after the pop opcode (after generating filth in c#).
+                    codeInstruction.labels.Add(skip_label);
-                else if (found_call)
+                    finished = true;
-                {
+                }
-                    //Load pawn, call function to check if a mechbreeder, and skip past the part which does damage
+            }
-                    yield return new CodeInstruction(OpCodes.Ldloc_0, null);
-                    yield return new CodeInstruction(OpCodes.Call, ismechbreeder);
-                    yield return new CodeInstruction(OpCodes.Brtrue_S, skip_label);
-                    found_call = false;
-                }
-            }
-            yield break;
         }
-    }
+    }
 }

1.5/Source/Genes/Fluid/FluidUtility.cs

@@ -16,7 +16,7 @@ namespace RJW_Genes
 			{
 				// Right now: Ignore Breasts, only do 
 				if (part is ISexPartHediff sexPart && (Genital_Helper.is_penis(part) || Genital_Helper.is_vagina(part)))
-					sexPart.GetPartComp().partFluidFactor *= multiplier;
+					sexPart.GetPartComp().partFluidMultiplier *= multiplier;
 			}
 		}
 

1.5/Source/Genes/GenitaliaSize/Genes/Gene_EvergrowingGenitalia.cs

@@ -2,13 +2,11 @@
 using RimWorld;
 using rjw;
 using System.Collections.Generic;
-using System;
 
 namespace RJW_Genes
 {
     public class Gene_EvergrowingGenitalia : RJW_Gene
     {
-
         const int BASE_TICKS = 60000;
 
         public override void Tick()
@@ -27,20 +25,21 @@ namespace RJW_Genes
 
         private void GrowPenisses()
         {
-            List<Hediff> AllPenisses = Genital_Helper.get_AllPartsHediffList(pawn).FindAll(x => Genital_Helper.is_penis(x));
+            List<Hediff> AllPenisses = Genital_Helper.get_AllPartsHediffList(pawn).FindAll(x => Genital_Helper.is_penis(x));
-            foreach(Hediff penis in AllPenisses)
+            float bodySizeOverride = -1f; //this is just hackjob to temporary fix an issue. It need to be remade
+            foreach (Hediff penis in AllPenisses)
             {
                 HediffComp_SexPart CompHediff = penis.TryGetComp<rjw.HediffComp_SexPart>();
                 if (CompHediff.baseSize <= 1.00f)
                     CompHediff.baseSize += 0.10f;
                 else
                 {
-                    if (CompHediff.bodySizeOverride <= 1.0) CompHediff.bodySizeOverride = 1.0f;
+                    if (bodySizeOverride <= 1.0) bodySizeOverride = 1.0f;
-                    CompHediff.bodySizeOverride += 0.05f;
+                    bodySizeOverride += 0.05f;
                 }
                 CompHediff.UpdateSeverity();
 
-                if (CompHediff.bodySizeOverride > 3.0f)
+                if (bodySizeOverride > 3.0f)
                 {
                     // Add Mental Hediff 
                     HandleGenitaliaSizeThoughts(pawn);
@@ -48,13 +47,14 @@ namespace RJW_Genes
 
                 // Increase Fluid
                 if (CompHediff != null)
-                    CompHediff.partFluidFactor *= 1.05f;
+                    CompHediff.partFluidMultiplier *= 1.05f;
             }
         }
 
         private void GrowVaginas()
         {
-            List<Hediff> AllVaginas = Genital_Helper.get_AllPartsHediffList(pawn).FindAll(x => Genital_Helper.is_vagina(x));
+            List<Hediff> AllVaginas = Genital_Helper.get_AllPartsHediffList(pawn).FindAll(x => Genital_Helper.is_vagina(x));
+            float bodySizeOverride = -1f; //this is just hackjob to temporary fix an issue. It need to be remade
             foreach (Hediff vagina in AllVaginas)
             {
                 HediffComp_SexPart CompHediff = vagina.TryGetComp<rjw.HediffComp_SexPart>();
@@ -62,21 +62,21 @@ namespace RJW_Genes
                     CompHediff.baseSize += 0.10f;
                 else
                 {
-                    if (CompHediff.bodySizeOverride <= 1.0) CompHediff.bodySizeOverride = 1.0f;
+                    if (bodySizeOverride <= 1.0) bodySizeOverride = 1.0f;
-                    CompHediff.bodySizeOverride += 0.05f;
+                    bodySizeOverride += 0.05f;
                 }
                     //CompHediff.ForceSize(CompHediff.Size + 0.05f);
                     //CompHediff.originalOwnerSize += 0.05f;
                 CompHediff.UpdateSeverity();
 
-                if (CompHediff.bodySizeOverride > 3.0f)
+                if (bodySizeOverride > 3.0f)
                 {
                     // Add Mental Hediff 
                     HandleGenitaliaSizeThoughts(pawn);
                 }
                 // Increase Fluid
                 if (CompHediff != null)
-                    CompHediff.partFluidFactor *= 1.025f;
+                    CompHediff.partFluidMultiplier *= 1.025f;
             }
         }
 

1.5/Source/Genes/Life_Force/Interactions/SuccubusTailjob/GenesPartKindUsageRule.cs

@@ -29,13 +29,13 @@ namespace RJW_Genes.Interactions
                 {
                     weight *= 2.5f;
                 }
-                if (pawn.genes.HasGene(GeneDefOf.rjw_genes_cum_eater))
+                if (pawn.genes.HasActiveGene(GeneDefOf.rjw_genes_cum_eater))
                 {
                     yield return new Weighted<LewdablePartKind>(weight, LewdablePartKind.Mouth);
                     yield return new Weighted<LewdablePartKind>(weight, LewdablePartKind.Beak);
                 }
 
-                if (pawn.genes.HasGene(GeneDefOf.rjw_genes_fertilin_absorber))
+                if (pawn.genes.HasActiveGene(GeneDefOf.rjw_genes_fertilin_absorber))
                 {
                     yield return new Weighted<LewdablePartKind>(weight, LewdablePartKind.Vagina);
                     yield return new Weighted<LewdablePartKind>(weight, LewdablePartKind.Anus);
@@ -62,7 +62,7 @@ namespace RJW_Genes.Interactions
                 yield return new Weighted<LewdablePartKind>(weight, LewdablePartKind.Mouth);
                 yield return new Weighted<LewdablePartKind>(weight, LewdablePartKind.Beak);
 
-                if (pawn.genes.HasGene(GeneDefOf.rjw_genes_fertilin_absorber))
+                if (pawn.genes.HasActiveGene(GeneDefOf.rjw_genes_fertilin_absorber))
                 {
                     yield return new Weighted<LewdablePartKind>(weight, LewdablePartKind.Vagina);
                     yield return new Weighted<LewdablePartKind>(weight, LewdablePartKind.Anus);

1.5/Source/Genes/Special/Patches/Patch_HormonalSaliva.cs

@@ -61,7 +61,7 @@ namespace RJW_Genes
 
                 // Increase Fluid
                 if (CompHediff != null)
-                    CompHediff.partFluidFactor *= cum_multiplier;
+                    CompHediff.partFluidMultiplier *= cum_multiplier;
             }
         }