Merge pull request #31 from jecrell/dev

Version change
jecrell · Oct 28, 2022 · 9c83bf2 · 9c83bf2
2 parents 85f7828 + d53dd84
commit 9c83bf2
Show file tree

Hide file tree

Showing 19 changed files with 76 additions and 67 deletions.
diff --git a/1.4/Assemblies/0JecsTools.dll b/1.4/Assemblies/0JecsTools.dll
diff --git a/1.4/Assemblies/AbilityUser.dll b/1.4/Assemblies/AbilityUser.dll
diff --git a/1.4/Assemblies/AbilityUserAI.dll b/1.4/Assemblies/AbilityUserAI.dll
diff --git a/1.4/Assemblies/CompActivatableEffect.dll b/1.4/Assemblies/CompActivatableEffect.dll
diff --git a/1.4/Assemblies/CompAnimated.dll b/1.4/Assemblies/CompAnimated.dll
diff --git a/1.4/Assemblies/CompBigBox.dll b/1.4/Assemblies/CompBigBox.dll
diff --git a/1.4/Assemblies/CompDelayedSpawner.dll b/1.4/Assemblies/CompDelayedSpawner.dll
diff --git a/1.4/Assemblies/CompInstalledPart.dll b/1.4/Assemblies/CompInstalledPart.dll
diff --git a/1.4/Assemblies/CompOversizedWeapon.dll b/1.4/Assemblies/CompOversizedWeapon.dll
diff --git a/1.4/Assemblies/CompSlotLoadable.dll b/1.4/Assemblies/CompSlotLoadable.dll
diff --git a/About/About.xml b/About/About.xml
@@ -19,7 +19,7 @@
       <downloadUrl>https://github.com/pardeike/HarmonyRimWorld/releases/latest</downloadUrl>
     </li>
   </modDependencies>
-  <description>1.4.0.0 (10-21-2022)
+  <description>1.4.1.1 (10-28-2022)
 
 Adds modding components to RimWorld: vehicles, spell casting, weapon slots, oversized weapons, and more!
 
@@ -71,11 +71,19 @@ Improvements by lbmaian
 Thank you to my Patrons for supporting me in my efforts. Without you, none of this would be possible.
 
 These are the most excellent rim dwellers who support me: 
-Michael Fisher, Storm D Bain, Luke Salinas, WonkyWoo WeebHoo, Daniel Schott, RainerWingel , Lea Stannard, David Silberstein, Matt Harris, Kiya Nicoll, Paul Fenwick, Elodie , Genaeve , David Turner, Populous25 , Matthew Isom, Charlie Garnham, TinyATuin, Michael Cailler, Jimes Tooper, Landon Cash, Sharp Spook, Don Homer, roxxploxx , Alex Mederer, Justin Andres, Dan Jones, Kaz, Michael Whitehead, iknowdude00, Alexander , Ken Birdwell, Michael Fisher, Storm D Bain, Luke Salinas, WonkyWoo WeebHoo, Daniel Schott, RainerWingel , Lea Stannard, David Silberstein, Matt Harris, Kiya Nicoll, Paul Fenwick, Elodie , Genaeve , David Turner, Populous25 , Matthew Isom, Charlie Garnham, TinyATuin, Michael Cailler, Jimes Tooper, Landon Cash, Sharp Spook, Don Homer, roxxploxx , Alex Mederer, Justin Andres, Dan Jones, Kaz, Michael Whitehead, iknowdude00, Alexander , Ken Birdwell
+Darcilyn Lynds (darci.andel), Luke Salinas, RainerWingel , Noisy Koi, Lea Stannard, David Silberstein, Matt Harris, Kiya Nicoll, Paul Fenwick, Genaeve , Populous25 , David Turner, TinyATuin, Michael Cailler, Jimes Tooper, Sharp Spook, Don Homer, roxxploxx , Alex Mederer, Dan Jones, Michael Whitehead, iknowdude00, Kaz, Alexander , Ken Birdwell, Darcilyn Lynds (darci.andel), Luke Salinas, RainerWingel , Noisy Koi, Lea Stannard, David Silberstein, Matt Harris, Kiya Nicoll, Paul Fenwick, Genaeve , Populous25 , David Turner, TinyATuin, Michael Cailler, Jimes Tooper, Sharp Spook, Don Homer, roxxploxx , Alex Mederer, Dan Jones, Michael Whitehead, iknowdude00, Kaz, Alexander , Ken Birdwell
 
 ========================
 Changelog
 ========================
+1.4.1.1 (10-28-2022)
+========================
+Added xenotype boolean for PawnkindGeneExtension. Code housekeeping done as well
+
+1.4.1.0 (10-27-2022)
+========================
+Modders can now give PawnKindDefs random chances for genetics using JecsTools.PawnKindGeneExtension on PawnKindDefs under modExtensions
+
 1.4.0.0 (10-21-2022)
 ========================
 Initial update for RimWorld 1.4 of JecsTools

diff --git a/About/Changelog.txt b/About/Changelog.txt
@@ -1,3 +1,11 @@
+1.4.1.1 (10-28-2022)
+========================
+Added xenotype boolean for PawnkindGeneExtension. Code housekeeping done as well
+
+1.4.1.0 (10-27-2022)
+========================
+Modders can now give PawnKindDefs random chances for genetics using JecsTools.PawnKindGeneExtension on PawnKindDefs under modExtensions
+
 1.4.0.0 (10-21-2022)
 ========================
 Initial update for RimWorld 1.4 of JecsTools

diff --git a/About/Manifest.xml b/About/Manifest.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
 <Manifest>
   <identifier>JecsTools</identifier>
-  <version>1.4.0.0</version>
+  <version>1.4.1.1</version>
   <dependencies />
   <incompatibleWith />
   <manifestUri>https://raw.githubusercontent.com/jecrell/JecsTools/master/About/Manifest.xml</manifestUri>

diff --git a/About/Version.txt b/About/Version.txt
@@ -1 +1 @@
-1.4.0.0
+1.4.1.1
diff --git a/Source/AllModdingComponents/JecsTools/PawnKindGeneExtension/HarmonyPatches_StartWithGenes.cs b/Source/AllModdingComponents/JecsTools/PawnKindGeneExtension/HarmonyPatches_StartWithGenes.cs
@@ -0,0 +1,36 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using HarmonyLib;
+using RimWorld;
+using UnityEngine;
+using Verse;
+
+namespace JecsTools;
+
+public static partial class HarmonyPatches
+{
+    public static void HarmonyPatches_StartWithGenes(Harmony harmony, Type type)
+    {
+        //Allows for adding additional genes when characters spawn with the PawnKindGeneExtension modExtension
+        harmony.Patch(AccessTools.Method(typeof(PawnGenerator), nameof(PawnGenerator.GeneratePawn),
+                new[] { typeof(PawnGenerationRequest) }),
+            postfix: new HarmonyMethod(type, nameof(Post_GeneratePawn_Genes)));
+    }
+
+    public static void Post_GeneratePawn_Genes(Pawn __result)
+    {
+        if (!ModsConfig.BiotechActive)
+            return;
+
+        var pawnKindGeneExtension = __result?.kindDef.GetPawnKindGeneExtension();
+        if (pawnKindGeneExtension == null)
+            return;
+
+        foreach (var gene in pawnKindGeneExtension.Genes.Where(gene => Rand.Range(min: 0, max: 100) < gene.chance))
+        {
+            __result.genes.AddGene(DefDatabase<GeneDef>.GetNamed(gene.defName), gene.xenogene);
+        }
+    }
+
+}
diff --git a/...s/StartWithGenes/PawnKindGeneExtension.cs → ...indGeneExtension/PawnKindGeneExtension.cs b/...s/StartWithGenes/PawnKindGeneExtension.cs → ...indGeneExtension/PawnKindGeneExtension.cs
@@ -7,6 +7,7 @@ namespace JecsTools
     public class ChancedGeneEntry
     {
         public string defName;
+        public bool xenogene = false;
         public float chance = 100;
     }
 

diff --git a/Source/AllModdingComponents/JecsTools/StartWithGenes/HarmonyPatches_StartWithGenes.cs b/Source/AllModdingComponents/JecsTools/StartWithGenes/HarmonyPatches_StartWithGenes.cs
diff --git a/Source/AllModdingComponents/JecsTools/Utility/DefModExtensionUtility.cs b/Source/AllModdingComponents/JecsTools/Utility/DefModExtensionUtility.cs
@@ -46,5 +46,19 @@ public static ApparelExtension GetApparelExtension(this Def def)
             }
             return null;
         }
+
+
+        public static PawnKindGeneExtension GetPawnKindGeneExtension(this Def def)
+        {
+            var modExtensions = def.modExtensions;
+            if (modExtensions == null)
+                return null;
+            for (int i = 0, count = modExtensions.Count; i < count; i++)
+            {
+                if (modExtensions[i] is PawnKindGeneExtension modExtension)
+                    return modExtension;
+            }
+            return null;
+        }
     }
 }
diff --git a/updateinfo b/updateinfo
@@ -3,10 +3,10 @@
 ==============================
 
 JecsTools Update
-v1.4.0.0 (10-21-2022)
+v1.4.1.0 (10-27-2022)
 ====================
 
-Initial update for RimWorld 1.4 of JecsTools
+Modders can now give PawnKindDefs random chances for genetics using JecsTools.PawnKindGeneExtension on PawnKindDefs under modExtensions
 --------------------
 
 Download now on...
@@ -25,9 +25,9 @@ Discuss the mod on...
 [img width=260]https://raw.githubusercontent.com/jecrell/JecsTools/master/About/Preview.png[/img]
 [hr]
 [b]JecsTools
-Version: 1.4.0.0
-Updated: 10-21-2022
-Description: [color=orange]Initial update for RimWorld 1.4 of JecsTools[/color]
+Version: 1.4.1.0
+Updated: 10-27-2022
+Description: [color=orange]Modders can now give PawnKindDefs random chances for genetics using JecsTools.PawnKindGeneExtension on PawnKindDefs under modExtensions[/color]
 [hr]
 [b]Download now on...[/b]
 [url=https://www.patreon.com/posts/73617775]Patreon[/url]