Merge pull request #3110 from Rhinous/Development

Fix pawns not generating ammo for primary weapon
CombatExtended-Continued · May 1, 2024 · f7ea88e · f7ea88e
2 parents 27425c3 + 80e539c
commit f7ea88e
Show file tree

Hide file tree

Showing 2 changed files with 25 additions and 25 deletions.
diff --git a/Source/CombatExtended/Harmony/Harmony_PawnInventoryGenerator.cs b/Source/CombatExtended/Harmony/Harmony_PawnInventoryGenerator.cs
diff --git a/Source/CombatExtended/Harmony/Harmony_PawnWeaponGenerator.cs b/Source/CombatExtended/Harmony/Harmony_PawnWeaponGenerator.cs
@@ -0,0 +1,25 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using RimWorld;
+using Verse;
+using UnityEngine;
+using HarmonyLib;
+
+namespace CombatExtended.HarmonyCE
+{
+    [HarmonyPatch(typeof(PawnWeaponGenerator), "TryGenerateWeaponFor")]
+    static class Harmony_PawnWeaponGenerator_TryGenerateWeaponFor
+    {
+        public static void Postfix(Pawn pawn, PawnGenerationRequest request)
+        {
+            var loadoutProps = pawn.kindDef.GetModExtension<LoadoutPropertiesExtension>();
+            if (loadoutProps != null)
+            {
+                float biocodeChance = (request.BiocodeWeaponChance > 0f) ? request.BiocodeWeaponChance : pawn.kindDef.biocodeWeaponChance;  //pass biocode weapon chance to generate loadout
+                loadoutProps.GenerateLoadoutFor(pawn, biocodeChance);
+            }
+        }
+    }
+}