mirror of
https://github.com/ZDoom/gzdoom.git
synced 2024-11-26 14:01:45 +00:00
f517d33ecf
The previous attempt to fix this did so partially; the range was fixed for AimLineAttack, but not for LineAttack, too.
82 lines
No EOL
1.6 KiB
Text
82 lines
No EOL
1.6 KiB
Text
// --------------------------------------------------------------------------
|
|
//
|
|
// Fist
|
|
//
|
|
// --------------------------------------------------------------------------
|
|
|
|
class Fist : Weapon
|
|
{
|
|
Default
|
|
{
|
|
Weapon.SelectionOrder 3700;
|
|
Weapon.Kickback 100;
|
|
Obituary "$OB_MPFIST";
|
|
Tag "$TAG_FIST";
|
|
+WEAPON.WIMPY_WEAPON
|
|
+WEAPON.MELEEWEAPON
|
|
+WEAPON.NOAUTOSWITCHTO
|
|
}
|
|
States
|
|
{
|
|
Ready:
|
|
PUNG A 1 A_WeaponReady;
|
|
Loop;
|
|
Deselect:
|
|
PUNG A 1 A_Lower;
|
|
Loop;
|
|
Select:
|
|
PUNG A 1 A_Raise;
|
|
Loop;
|
|
Fire:
|
|
PUNG B 4;
|
|
PUNG C 4 A_Punch;
|
|
PUNG D 5;
|
|
PUNG C 4;
|
|
PUNG B 5 A_ReFire;
|
|
Goto Ready;
|
|
}
|
|
}
|
|
|
|
|
|
//===========================================================================
|
|
//
|
|
// Code (must be attached to Actor)
|
|
//
|
|
//===========================================================================
|
|
|
|
extend class Actor
|
|
{
|
|
action void A_Punch()
|
|
{
|
|
FTranslatedLineTarget t;
|
|
|
|
if (player != null)
|
|
{
|
|
Weapon weap = player.ReadyWeapon;
|
|
if (weap != null && !weap.bDehAmmo && invoker == weap && stateinfo != null && stateinfo.mStateType == STATE_Psprite)
|
|
{
|
|
if (!weap.DepleteAmmo (weap.bAltFire))
|
|
return;
|
|
}
|
|
}
|
|
|
|
int damage = random[Punch](1, 10) << 1;
|
|
|
|
if (FindInventory("PowerStrength"))
|
|
damage *= 10;
|
|
|
|
double ang = angle + Random2[Punch]() * (5.625 / 256);
|
|
double range = MeleeRange + MELEEDELTA;
|
|
double pitch = AimLineAttack (ang, range, null, 0., ALF_CHECK3D);
|
|
|
|
LineAttack (ang, range, pitch, damage, 'Melee', "BulletPuff", LAF_ISMELEEATTACK, t);
|
|
|
|
// turn to face target
|
|
if (t.linetarget)
|
|
{
|
|
A_StartSound ("*fist", CHAN_WEAPON);
|
|
angle = t.angleFromSource;
|
|
}
|
|
}
|
|
|
|
} |