If giving ammo, an add_ammo amount should apply even if the pawn doesn't

have the ammo type already Die4Ever#807
MQDuck · Jul 18, 2024 · 7e271ae · 7e271ae
1 parent 8f41aef
commit 7e271ae
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 5 deletions.
diff --git a/DXRCore/DeusEx/Classes/DXRActorsBase.uc b/DXRCore/DeusEx/Classes/DXRActorsBase.uc
@@ -256,6 +256,9 @@ static function Inventory GiveExistingItem(Pawn p, Inventory item, optional int
                 player.UpdateAmmoBeltText(a);
             item.Destroy();
             return a;
+        } else {
+            //Make sure the extra ammo is included even if the pawn doesn't have it already
+            Ammo(item).AmmoAmount += add_ammo;
         }
     }
 

diff --git a/DXRMapFixups/DeusEx/Classes/DXRFixupM01.uc b/DXRMapFixups/DeusEx/Classes/DXRFixupM01.uc
@@ -63,9 +63,7 @@ function PreFirstEntryMapFixes()
         class'GuntherWeaponMegaChoice'.static.Create(Player());
         foreach AllActors(class'#var(prefix)GuntherHermann',gunther){
             //Make sure he has ammo for Assault Rifle (7.62mm), Stealth Pistol(10mm), Pistol (10mm)
-            GiveItem(gunther, class'Ammo762mm');
             GiveItem(gunther, class'Ammo762mm',300);
-            GiveItem(gunther, class'Ammo10mm');
             GiveItem(gunther, class'Ammo10mm',150);
             break;
         }

diff --git a/DXRMapFixups/DeusEx/Classes/DXRFixupM04.uc b/DXRMapFixups/DeusEx/Classes/DXRFixupM04.uc
@@ -85,11 +85,8 @@ function PreFirstEntryMapFixes()
         foreach AllActors(class'#var(prefix)GilbertRenton',gilbert){
             //Make sure he has ammo for Stealth Pistol(10mm), Pistol (10mm),
             //Sawed-off (Buckshot shells), Mini Crossbow (Tranq Darts)
-            GiveItem(gilbert, class'AmmoShell');
             GiveItem(gilbert, class'AmmoShell',20);
-            GiveItem(gilbert, class'Ammo10mm');
             GiveItem(gilbert, class'Ammo10mm',20);
-            GiveItem(gilbert, class'AmmoDartPoison');
             GiveItem(gilbert, class'AmmoDartPoison',20);
             break;
         }