Merge pull request #1040 from CombatExtendedRWMod/Fix-for-#1038

Fix for #1038 (generateAllowChance instead of generateCommonality)
CombatExtendedRWMod · Feb 22, 2020 · d90a068 · d90a068
2 parents 9521fc9 + 8ecdabc
commit d90a068
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/Source/CombatExtended/CombatExtended/Defs/LoadoutPropertiesExtension.cs b/Source/CombatExtended/CombatExtended/Defs/LoadoutPropertiesExtension.cs
@@ -158,8 +158,8 @@ private void LoadWeaponWithRandAmmo(ThingWithComps gun)
                 return;
             }
             // Determine ammo
-            IEnumerable<AmmoDef> availableAmmo = compAmmo.Props.ammoSet.ammoTypes.Where(a => a.ammo.alwaysHaulable).Select(a => a.ammo); //Running out of options. alwaysHaulable does exist in xml.
-            AmmoDef ammoToLoad = availableAmmo.RandomElementByWeight(a => a.generateCommonality);
+            IEnumerable<AmmoDef> availableAmmo = compAmmo.Props.ammoSet.ammoTypes.Where(a => a.ammo.alwaysHaulable && a.ammo.generateAllowChance > 0f).Select(a => a.ammo); //Running out of options. alwaysHaulable does exist in xml.
+            AmmoDef ammoToLoad = availableAmmo.RandomElementByWeight(a => a.generateAllowChance);
             compAmmo.ResetAmmoCount(ammoToLoad);
         }