OrdinaryMagician/swwmgz_m
OrdinaryMagician/swwmgz_m
1
Fork 0
Code Activity

Combat hammer tertiary fire implemented.

Browse source
This commit is contained in:
Mari the Deer 2022-08-11 16:24:36 +02:00
commit 311bf6e899
13 changed files with 223 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

5
zscript/weapons/swwm_baseweapon_melee.zsc
View file

@ -370,7 +370,8 @@ extend Class SWWMWeapon
MELEE_ForceBust = 8, // bust walls even without Omnibusting enabled
MELEE_Vertical = 16, // ring is widened vertically, rather than horizontally
MELEE_Wider = 32, // ring is widened by 2.5x rather than 1.5x
MELEE_ExtraWide = 64 // if Wider is also specified, widen by 5x, otherwise widen by 3x
MELEE_ExtraWide = 64, // if Wider is also specified, widen by 5x, otherwise widen by 3x
MELEE_HammerHit = 128 // is hammer melee (gibbing counts for "HAHA DAB" achievement)
};
action void A_Parry( int duration )
@ -446,6 +447,8 @@ extend Class SWWMWeapon
let p = Spawn(raging?"BigPunchImpact":"PunchImpact",mt.hits[i].pos);
p.angle = atan2(mt.hits[i].dir.y,mt.hits[i].dir.x);
}
if ( (flags&MELEE_HammerHit) && (mt.hits[i].a.Health <= mt.hits[i].a.GetGibHealth()) )
SWWMUtility.AchievementProgressInc("dab",1,player);
}
if ( raging )
{