zdoom/gzdoom
0
0
Fork 0
mirror of https://github.com/ZDoom/gzdoom.git synced 2025-02-20 19:12:07 +00:00
Code Issues Projects Releases Packages Wiki Activity

- fixed melee attack disance being off after adding MBF21 support.

Browse source
This commit is contained in:
Christoph Oelckers 2021-09-17 22:59:30 +02:00
parent 67958833b7
commit 08baad6e21
4 changed files with 5 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
wadsrc/static/zscript/actors/actor.zs
View file

@ -81,6 +81,7 @@ class Actor : Thinker native
const ORIG_FRICTION = (0xE800/65536.); // original value
const ORIG_FRICTION_FACTOR = (2048/65536.); // original value
const DEFMORPHTICS = 40 * TICRATE;
const MELEEDELTA = 20;
// flags are not defined here, the native fields for those get synthesized from the internal tables.
@ -380,7 +381,7 @@ class Actor : Thinker native
RenderStyle 'Normal';
Alpha 1;
MinMissileChance 200;
MeleeRange 64 - 20;
MeleeRange 64 - MELEEDELTA;
MaxDropoffHeight 24;
MaxStepHeight 24;
MaxSlopeSteepness STEEPSLOPE;

2
wadsrc/static/zscript/actors/doom/weaponchainsaw.zs
View file

@ -65,7 +65,7 @@ extend class StateProvider
}
if (range == 0)
{
range = MeleeRange + (1. / 65536.); // MBF21 SAWRANGE;
range = MeleeRange + MELEEDELTA + (1. / 65536.); // MBF21 SAWRANGE;
}
double ang = angle + spread_xy * (Random2[Saw]() / 255.);

2
wadsrc/static/zscript/actors/doom/weaponfist.zs
View file

@ -66,7 +66,7 @@ extend class Actor
damage *= 10;
double ang = angle + Random2[Punch]() * (5.625 / 256);
double pitch = AimLineAttack (ang, MeleeRange, null, 0., ALF_CHECK3D);
double pitch = AimLineAttack (ang, MeleeRange + MELEEDELTA, null, 0., ALF_CHECK3D);
LineAttack (ang, MeleeRange, pitch, damage, 'Melee', "BulletPuff", LAF_ISMELEEATTACK, t);

2
wadsrc/static/zscript/actors/mbf21.zs
View file

@ -379,7 +379,7 @@ extend class Weapon
// slight randomization; weird vanillaism here. :P
FTranslatedLineTarget t;
double ang = angle + Random2[mbf21]() * (5.625 / 256);
double pitch = AimLineAttack(ang, MeleeRange, t, 0., ALF_CHECK3D);
double pitch = AimLineAttack(ang, range + MELEEDELTA, t, 0., ALF_CHECK3D);
LineAttack(ang, range, pitch, damage, 'Melee', "BulletPuff", LAF_ISMELEEATTACK, t);
// turn to face target