OrdinaryMagician/swwmgz_m
OrdinaryMagician/swwmgz_m
1
Fork 0
Code Activity

The stuff from master.

Browse source
This commit is contained in:
Mari the Deer 2021-10-22 17:30:41 +02:00
commit 5d2aecafe1
11 changed files with 159 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

14
zscript/handler/swwm_handler_damage.zsc
View file

@ -186,7 +186,7 @@ extend Class SWWMHandler
}
int pnum = src.PlayerNumber();
// achievement stuff
if ( e.Thing.IsHostile(src) )
if ( e.Thing.IsHostile(src) && (e.Thing.bISMONSTER || e.Thing.player) )
{
if ( (e.Thing.bBOSS||e.Thing.FindInventory("BossMarker")) && ((e.DamageType == 'Dash') || (e.DamageType == 'Buttslam')) )
SWWMUtility.AchievementProgressInc("bossdash",1,src.player);
@ -218,6 +218,18 @@ extend Class SWWMHandler
onehpspree[pnum]++;
SWWMUtility.AchievementProgress("onehp",onehpspree[pnum],src.player);
}
// tasty treats
if ( swwm_demoslayer && (src.Health < 100) )
{
int amt = clamp(min(-e.Thing.Health,-e.Thing.GetGibHealth())/5,0,20);
for ( int i=0; i<amt; i++ )
{
let a = Actor.Spawn("HealthOrb",e.Thing.Vec3Offset(0,0,e.Thing.Height/2));
a.vel.z = FRandom[Junk](4,12);
double ang = FRandom[Junk](0,360);
a.vel.xy = (cos(ang),sin(ang))*FRandom[Junk](4,6);
}
}
}
// no credits unless it's a counted kill or marine (that isn't friendly) or another player in DM
if ( e.Thing.IsFriend(src) || (!e.Thing.default.bCountKill && !(e.Thing is 'ScriptedMarine') && !(deathmatch && e.Thing.player)) )