zdoom/gzdoom
0
0
Fork 0
mirror of https://github.com/ZDoom/gzdoom.git synced 2024-11-21 19:51:27 +00:00
Code Issues Projects Releases Packages Wiki Activity

- fix harmony grenade not working

Browse source
This commit is contained in:
Rachael Alexanderson 2024-04-17 20:16:15 -04:00
parent 6226f03bb4
commit 6f7eededfb
No known key found for this signature in database
GPG key ID: 26A8ACCE97115EE0
3 changed files with 67 additions and 46 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

45
wadsrc_extra/static/filter/harmony/decorate.txt
View file

@ -1274,51 +1274,6 @@ actor HarmonyBackpack : Backpack replaces Backpack
scale 0.30
}
actor TimeBombWeapon : Weapon replaces BFG9000
{
scale 0.30
weapon.kickback 100
weapon.selectionorder 2800
weapon.ammouse 1
weapon.ammogive 2
weapon.ammotype "TimeBombAmmo"
inventory.pickupmessage "$GOTBFG9000"
inventory.icon "BFUGA0"
+WEAPON.NOAUTOFIRE
+WEAPON.NOAUTOAIM
states
{
Select:
BFGG A 1 A_Raise
loop
Deselect:
BFGG A 1 A_Lower
loop
Ready:
BFGG A 1 A_WeaponReady
loop
Fire:
SHT2 A 3
SHT2 A 7 A_CheckReload
SHT2 B 1 A_BFGSound
SHT2 B 7
SHT2 C 6
SHT2 D 7 A_FireBFG
SHT2 E 7
SHT2 F 7 A_Light0
SHT2 H 6 A_Light0
SHT2 A 5 A_Refire
goto Ready
Flash:
BFGF A 11 bright A_Light1
BFGF B 6 bright A_Light2
SHTG E 0 A_Light0
stop
Spawn:
BFUG A -1
stop
}
}
// The player should start with the hand grenades weapon, but no ammo.
// TimeBombWeapon is used as the pickup which should only be picked up once
// in multi player.

3
wadsrc_extra/static/filter/harmony/zscript.txt
View file

@ -1,2 +1,3 @@
version "4.5"
#include "zscript/harm_sbar.zs"
#include "zscript/harm_sbar.zs"
#include "zscript/decorate_replacement.zs"

65
wadsrc_extra/static/filter/harmony/zscript/decorate_replacement.zs Normal file
View file

@ -0,0 +1,65 @@
class TimeBombWeapon : Weapon replaces BFG9000
{
default
{
scale 0.30;
weapon.kickback 100;
weapon.selectionorder 2800;
weapon.ammouse 1;
weapon.ammogive 2;
weapon.ammotype "TimeBombAmmo";
inventory.pickupmessage "$GOTBFG9000";
inventory.icon "BFUGA0";
+WEAPON.NOAUTOFIRE;
+WEAPON.NOAUTOAIM;
}
states
{
Select:
BFGG A 1 A_Raise;
loop;
Deselect:
BFGG A 1 A_Lower;
loop;
Ready:
BFGG A 1 A_WeaponReady;
loop;
Fire:
SHT2 A 3;
SHT2 A 7 A_CheckReload;
SHT2 B 1 A_BFGSound;
SHT2 B 7;
SHT2 C 6;
SHT2 D 7 A_FireGrenade;
SHT2 E 7;
SHT2 F 7 A_Light0;
SHT2 H 6 A_Light0;
SHT2 A 5 A_Refire;
goto Ready;
Flash:
BFGF A 11 bright A_Light1;
BFGF B 6 bright A_Light2;
SHTG E 0 A_Light0;
stop;
Spawn:
BFUG A -1;
stop;
}
action void A_FireGrenade()
{
if (player == null)
{
return;
}
Weapon weap = player.ReadyWeapon;
if (weap != null && invoker == weap && stateinfo != null && stateinfo.mStateType == STATE_Psprite)
{
if (!weap.DepleteAmmo (weap.bAltFire, true, weap.ammouse1))
return;
}
SpawnPlayerMissile("BFGBall", angle, nofreeaim:sv_nobfgaim);
}
}