OrdinaryMagician/swwmgz_m
OrdinaryMagician/swwmgz_m
1
Fork 0
Code Activity

Tweaks to casings and dropped mags.

Browse source
This commit is contained in:
Mari the Deer 2020-08-07 00:08:13 +02:00
commit 63152988fe
9 changed files with 43 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

25
zscript/swwm_danmaku.zsc
View file

@ -216,8 +216,15 @@ Class EvisceratorChunk : Actor
{
target.SpawnBlood(pos,AngleTo(target),damage);
A_StartSound("eviscerator/hitf",CHAN_WEAPON,CHANF_OVERLAP,.1);
if ( swwm_extraalert || !Random[Eviscerator](0,3) ) A_AlertMonsters(900);
}
else
{
let l = Spawn("ChunkImpact",pos);
l.angle = angle+180;
l.pitch = -pitch;
A_StartSound("eviscerator/hit",CHAN_WEAPON,CHANF_OVERLAP,.1);
}
if ( swwm_extraalert || !Random[Eviscerator](0,3) ) A_AlertMonsters(900);
return -1;
}
@ -238,10 +245,20 @@ Class EvisceratorChunk : Actor
if ( victim.health-amt <= 0 )
{
// bleed if not gibbed (reduces effect spam)
if ( !victim.bNOBLOOD && !victim.bINVULNERABLE && (victim.health-amt > victim.GetGibHealth()) )
if ( victim.health-amt > victim.GetGibHealth() )
{
victim.SpawnBlood(pos,AngleTo(victim),damage);
A_StartSound("eviscerator/hitf",CHAN_WEAPON,CHANF_OVERLAP,.1);
if ( !victim.bNOBLOOD && !victim.bINVULNERABLE )
{
victim.SpawnBlood(pos,AngleTo(victim),damage);
A_StartSound("eviscerator/hitf",CHAN_WEAPON,CHANF_OVERLAP,.1);
}
else
{
let l = Spawn("ChunkImpact",pos);
l.angle = angle+180;
l.pitch = -pitch;
A_StartSound("eviscerator/hit",CHAN_WEAPON,CHANF_OVERLAP,.1);
}
}
vel *= .65; // reduce velocity as it rips
return 1;

2
zscript/swwm_inventory.zsc
View file

@ -416,7 +416,7 @@ Class SWWMCasing : Actor abstract
}
Goto Spawn;
Death:
XZW1 A -1
XZW1 B -1
{
pitch = roll = 0;
angle = FRandom[Junk](0,360);

3
zscript/swwm_sparkyboi.zsc
View file

@ -1908,11 +1908,12 @@ Class SparksterMag : SWWMCasing
States
{
Death:
#### # -1
XZW1 BC -1
{
pitch = 0;
angle = FRandom[Junk](0,360);
roll = 0;
frame = RandomPick[Junk](1,2);
}
Stop;
}