OrdinaryMagician/flak_m
OrdinaryMagician/flak_m
1
Fork 0
Code Activity

Removal of all RNG damage (excluding minigun).

Browse source 
Enhanced Shock Rifle is now actually instakill as it's meant to be.
Enhanced Shock Rifle is disabled by default for deathmatch (toggleable).
Implemented Instagib Deathmatch through flak_instagib cvar.
Fixed a small typo in the modeldef entry of the enhanced shock ball shockwave.
This commit is contained in:
Marisa the Magician 2019-04-07 21:37:24 +02:00
commit cbb498378e
14 changed files with 74 additions and 44 deletions
Download patch file Download diff file Expand all files Collapse all files

7
zscript/chainsaw.zsc
View file

@ -59,7 +59,7 @@ Class UTChainsaw : UTWeapon
LineTrace(angle,90,BulletSlope(),TRF_ABSPOSITION,origin.z,origin.x,origin.y,d);
if ( d.HitType == TRACE_HitActor )
{
int dmg = Random[Chainsaw](20,30);
int dmg = 20;
dmg = d.HitActor.DamageMobj(invoker,self,dmg,'slashed',DMG_USEANGLE,atan2(d.HitDir.y,d.HitDir.x));
d.HitActor.vel -= x*(500/d.HitActor.mass);
vel += x*(100/mass);
@ -98,9 +98,9 @@ Class UTChainsaw : UTWeapon
LineTrace(ang,90,BulletSlope(),TRF_ABSPOSITION,origin.z,origin.x,origin.y,d);
if ( d.HitType == TRACE_HitActor )
{
int dmg = Random[Chainsaw](20,30);
int dmg = 20;
if ( d.HitLocation.z >= (d.HitActor.pos.z+d.HitActor.height*0.8) )
dmg = d.HitActor.DamageMobj(invoker,self,dmg*2,'Decapitated',DMG_USEANGLE,atan2(d.HitDir.y,d.HitDir.x));
dmg = d.HitActor.DamageMobj(invoker,self,dmg*3,'Decapitated',DMG_USEANGLE,atan2(d.HitDir.y,d.HitDir.x));
else dmg = d.HitActor.DamageMobj(invoker,self,dmg,'slashed',DMG_USEANGLE,atan2(d.HitDir.y,d.HitDir.x));
d.HitActor.vel = -y*(1200/d.HitActor.mass);
vel += x*(100/mass);
@ -164,6 +164,7 @@ Class UTChainsaw : UTWeapon
Weapon.SelectionOrder 9;
+WEAPON.MELEEWEAPON;
+FORCEPAIN;
+NOEXTREMEDEATH;
}
States
{