Skip to content

Fix infinite rocket grenades from ZM, add unload sound to Lib & ZM when dropping loaded grenades #2

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
Syampuuh wants to merge 2 commits into
base: main
Choose a base branch
from
Open

Fix infinite rocket grenades from ZM, add unload sound to Lib & ZM when dropping loaded grenades #2

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
faef800
fix ZM infinite grenades, add unload sound
Syampuuh Oct 18, 2024
a611454
add unload sound
Syampuuh Oct 18, 2024
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
3 changes: 2 additions & 1 deletion ZScript/Weapons/Liberator.zsc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -110,6 +110,7 @@ class FW_Liberator : FollowerWeapon
if (wpn.WeaponStatus[LIBS_FLAGS] & LIBF_GRENADELOADED)
{
Owner.A_DropItem('HDRocketAmmo', 1);
Owner.A_StartSound("weapons/grenopen",CHAN_WEAPON);
}

nogl = wpn.WeaponStatus[LIBS_FLAGS] & LIBF_NOLAUNCHER? 1 : 0;
Expand Down Expand Up @@ -149,4 +150,4 @@ class FW_Liberator : FollowerWeapon

wpn.weaponstatus[LIBS_DOT] = Crossdot;
}
}
}
5 changes: 4 additions & 1 deletion ZScript/Weapons/ZM66.zsc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -115,6 +115,7 @@ class FW_ZM66 : FollowerWeapon
if (wpn.WeaponStatus[0] & ZM66F_GRENADELOADED)
{
Owner.A_DropItem('HDRocketAmmo', 1);
Owner.A_StartSound("weapons/grenopen",CHAN_WEAPON);
}

nogl = wpn.WeaponStatus[ZM66S_FLAGS] & ZM66F_NOLAUNCHER? 1 : 0;
Expand All @@ -126,6 +127,8 @@ class FW_ZM66 : FollowerWeapon
{
wpn.WeaponStatus[ZM66S_MAG] = Mag;

wpn.weaponstatus[ZM66S_FLAGS]&=~ZM66F_GRENADELOADED;

if(ChamberedRound > 0)wpn.weaponstatus[ZM66S_FLAGS]|=ZM66F_CHAMBER;
else wpn.weaponstatus[ZM66S_FLAGS]&=~ZM66F_CHAMBER;

Expand All @@ -137,4 +140,4 @@ class FW_ZM66 : FollowerWeapon

wpn.weaponstatus[ZM66S_DOT] = Crossdot;
}
}
}