Merge pull request #1344 from jaih1r0/PB_Staging

deagle reload changes
pa1nki113r · Dec 8, 2024 · d6e1fca · d6e1fca
2 parents 0361ec6 + 7240ac3
commit d6e1fca
Show file tree

Hide file tree

Showing 16 changed files with 2 additions and 2 deletions.
diff --git a/SPRITES/WEAPONS/Slot 2/Deagle/Reload/Partial/D0E0F0.png b/SPRITES/WEAPONS/Slot 2/Deagle/Reload/Partial/D0E0F0.png
diff --git a/SPRITES/WEAPONS/Slot 2/Deagle/Reload/Partial/D0E0G0.png b/SPRITES/WEAPONS/Slot 2/Deagle/Reload/Partial/D0E0G0.png
diff --git a/SPRITES/WEAPONS/Slot 2/Deagle/Reload/Partial/D0E0H0.png b/SPRITES/WEAPONS/Slot 2/Deagle/Reload/Partial/D0E0H0.png
diff --git a/SPRITES/WEAPONS/Slot 2/Deagle/Reload/Partial/D0E0I0.png b/SPRITES/WEAPONS/Slot 2/Deagle/Reload/Partial/D0E0I0.png
diff --git a/SPRITES/WEAPONS/Slot 2/Deagle/Reload/Partial/D0E0J0.png b/SPRITES/WEAPONS/Slot 2/Deagle/Reload/Partial/D0E0J0.png
diff --git a/SPRITES/WEAPONS/Slot 2/Deagle/Reload/Partial/D0E0K0.png b/SPRITES/WEAPONS/Slot 2/Deagle/Reload/Partial/D0E0K0.png
diff --git a/SPRITES/WEAPONS/Slot 2/Deagle/Reload/Partial/D0E0L0.png b/SPRITES/WEAPONS/Slot 2/Deagle/Reload/Partial/D0E0L0.png
diff --git a/brightmaps/WEAPONS/Slot 2/Deagle/Reload/BMD0E0F0.png b/brightmaps/WEAPONS/Slot 2/Deagle/Reload/BMD0E0F0.png
diff --git a/brightmaps/WEAPONS/Slot 2/Deagle/Reload/BMD0E0G0.png b/brightmaps/WEAPONS/Slot 2/Deagle/Reload/BMD0E0G0.png
diff --git a/brightmaps/WEAPONS/Slot 2/Deagle/Reload/BMD0E0H0.png b/brightmaps/WEAPONS/Slot 2/Deagle/Reload/BMD0E0H0.png
diff --git a/brightmaps/WEAPONS/Slot 2/Deagle/Reload/BMD0E0I0.png b/brightmaps/WEAPONS/Slot 2/Deagle/Reload/BMD0E0I0.png
diff --git a/brightmaps/WEAPONS/Slot 2/Deagle/Reload/BMD0E0J0.png b/brightmaps/WEAPONS/Slot 2/Deagle/Reload/BMD0E0J0.png
diff --git a/brightmaps/WEAPONS/Slot 2/Deagle/Reload/BMD0E0K0.png b/brightmaps/WEAPONS/Slot 2/Deagle/Reload/BMD0E0K0.png
diff --git a/brightmaps/WEAPONS/Slot 2/Deagle/Reload/BMD0E0L0.png b/brightmaps/WEAPONS/Slot 2/Deagle/Reload/BMD0E0L0.png
diff --git a/zscript/PB_Hud.zs b/zscript/PB_Hud.zs
@@ -1001,7 +1001,7 @@ class PB_Hud_ZS : BaseStatusBar
 					PBHud_DrawImage("BRACICON", (-82, -50), DI_SCREEN_RIGHT_BOTTOM | DI_ITEM_RIGHT_BOTTOM, 1, (27, 19));
 
 				//handles dual wielding ammo
-				if(PB_Weap.DualWieldToken && CheckInventory(PB_Weap.DualWieldToken) && PB_Weap.AmmoTypeLeft){
+				if(PB_Weap && PB_Weap.DualWieldToken && CheckInventory(PB_Weap.DualWieldToken) && PB_Weap.AmmoTypeLeft){
 					leftAmmoAmount = PB_Weap.AmmoTypeLeft.GetClassName();
 					if(WeaponUsesAmmoType("PB_HighCalMag")){
 						PBHud_DrawImage("BARBACY3", (-90, -71), DI_SCREEN_RIGHT_BOTTOM | DI_ITEM_RIGHT_BOTTOM, playerBoxAlpha);

diff --git a/zscript/Weapons/Slot2/Deagle.zs b/zscript/Weapons/Slot2/Deagle.zs
@@ -246,7 +246,7 @@ class PB_Deagle : PB_WeaponBase
 			}
 			TNT1 A 0 PB_jumpIfHasBarrel("IdleBarrel","IdleFlameBarrel","IdleIceBarrel");
 			TNT1 A 0 A_JumpIf(A_CheckAkimbo(), "ReloadDualWield");
-			TNT1 A 0 PB_checkReload("EmptyReload","Ready","NoAmmo",8,1);
+			TNT1 A 0 PB_checkReload("EmptyReload","Ready","NoAmmo",8,2);
 			TNT1 A 0 {
 				A_setinventory(invoker.UnloaderToken,0);
 				A_ZoomFactor(1.0);