Skip to content

Fix DoOutOfAmmoAction #4181

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
ViralReaction wants to merge 4 commits into
base: Development
Choose a base branch
from
Open

Fix DoOutOfAmmoAction #4181

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
d81c335
Fix DoOutOfAmmoAction
ViralReaction Aug 19, 2025
2989b41
Max Ammo To Pickup
ViralReaction Aug 23, 2025
a3a4bed
Merge branch 'Development' into Fix-Unequipping-Weapon
ViralReaction Dec 13, 2025
37a2bbd
Fix Reloading Job When Drafted
ViralReaction Dec 13, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 13 additions & 1 deletion Source/CombatExtended/CombatExtended/Comps/CompAmmoUser.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -658,7 +658,10 @@ private void DoOutOfAmmoAction()
}
if (!Holder.IsColonist || !parent.def.IsAOEWeapon())
{
TryPickupAmmo();
if (TryPickupAmmo())
{
return;
}
}
}
CompInventory?.SwitchToNextViableWeapon(!this.parent.def.weaponTags.Contains("NoSwitch"), !Holder.IsColonist, stopJob: false);
Expand Down Expand Up @@ -701,6 +704,11 @@ public bool TryPickupAmmo()
if (CompInventory.CanFitInInventory(thing, out int count))
{
Thing ammo = thing;
int maxAmmoToPickup = (MagSizeOverride > 0) ? MagSizeOverride * 4 : MagSize * 4;
if (count > maxAmmoToPickup)
{
count = maxAmmoToPickup;
}
if (!ammo.Position.AdjacentTo8WayOrInside(Holder))
{
Job pickupAmmo = JobMaker.MakeJob(JobDefOf.TakeInventory, ammo);
Expand All @@ -714,6 +722,10 @@ public bool TryPickupAmmo()
}
Job reload = TryMakeReloadJob();
Holder.jobs.jobQueue.EnqueueFirst(reload);
if (Holder.Drafted)
{
Holder.jobs.EndCurrentJob(JobCondition.InterruptForced);
}
return true;
}
}
Expand Down