More stuff I missed.
This commit is contained in:
parent
4b418e8015
commit
a2f245b189
37 changed files with 67 additions and 71 deletions
|
|
@ -318,9 +318,9 @@ Class BusterWall : Thinker
|
|||
if ( !SWWMUtility.PointInPolyobj((x,y),p) ) continue;
|
||||
inspot++;
|
||||
}
|
||||
if ( allspot <= 0 ) return false; // what the fuck?
|
||||
if ( allspot <= 0 ) return false; // huh???
|
||||
girthitude = (girthitude*inspot)/allspot;
|
||||
// too fucking huge
|
||||
// too huge
|
||||
if ( (girthitude > 16777216) || (max(b.z-a.z,max(b.x-a.x,b.y-a.y)) > 1024) ) return false;
|
||||
// not strong enough to bust
|
||||
if ( bust.accdamage < girthitude/300. ) return false;
|
||||
|
|
@ -497,9 +497,9 @@ Class BusterWall : Thinker
|
|||
allspot++;
|
||||
if ( level.PointInSector((x,y)) == hs ) inspot++;
|
||||
}
|
||||
if ( allspot <= 0 ) return false; // what the fuck?
|
||||
if ( allspot <= 0 ) return false; // huh???
|
||||
girthitude = (girthitude*inspot)/allspot;
|
||||
// too fucking huge
|
||||
// too huge
|
||||
if ( (girthitude > 16777216) || (max(partheight,max(b.x-a.x,b.y-a.y)) > 1024) ) return false;
|
||||
// not strong enough to bust
|
||||
if ( bust.accdamage < girthitude/300. ) return false;
|
||||
|
|
|
|||
|
|
@ -1119,7 +1119,7 @@ Class YnykronSingularity : SWWMNonInteractiveActor
|
|||
continue;
|
||||
}
|
||||
// voodoo dolls just get erased (how convenient)
|
||||
// otherwise instantly vaporize the fucker
|
||||
// otherwise instantly vaporize the poor sap
|
||||
if ( a.player && (a.player.mo != a) ) a.Destroy();
|
||||
else if ( a.CountInv("GrilledCheeseSandwich") > 0 )
|
||||
{
|
||||
|
|
|
|||
|
|
@ -41,7 +41,7 @@ Class AshenRemains : SWWMNonInteractiveActor
|
|||
}
|
||||
}
|
||||
|
||||
// cheap way to let players know they just got fucking erased from existence
|
||||
// cheap way to let players know they just got erased from existence
|
||||
Class PlayerGone : PlayerChunk
|
||||
{
|
||||
int deadtimer;
|
||||
|
|
@ -380,7 +380,7 @@ Class YnykronImpact : SWWMNonInteractiveActor
|
|||
if ( tracer )
|
||||
{
|
||||
// voodoo dolls just get erased (how convenient)
|
||||
// otherwise instantly vaporize the fucker
|
||||
// otherwise instantly vaporize the poor sap
|
||||
if ( tracer.player && (tracer.player.mo != tracer) )
|
||||
{
|
||||
if ( tracer.pos.z < (tracer.floorz+64) )
|
||||
|
|
|
|||
|
|
@ -29,7 +29,7 @@ Class SpreadgunTracer : LineTracer
|
|||
if ( Results.HitActor.bSHOOTABLE )
|
||||
{
|
||||
int amt = SWWMDamageAccumulator.GetAmount(Results.HitActor);
|
||||
// getgibhealth isn't clearscope, fuck
|
||||
// getgibhealth isn't clearscope and that's a problem
|
||||
int gibh = (Results.HitActor.GibHealth!=int.min)?-abs(Results.HitActor.GibHealth):-int(Results.HitActor.GetSpawnHealth()*gameinfo.gibfactor);
|
||||
// if gibbed, go through without dealing more damage
|
||||
if ( Results.HitActor.health-amt <= gibh ) return TRACE_Skip;
|
||||
|
|
|
|||
|
|
@ -762,7 +762,7 @@ Class DualExplodiumGun : SWWMWeapon
|
|||
}
|
||||
override bool Use( bool pickup )
|
||||
{
|
||||
// need to override here because other mods will fuck things up
|
||||
// need to override here because other mods could screw it up
|
||||
if ( !SisterWeapon || (SisterWeapon.Amount < 2) )
|
||||
return false;
|
||||
return Super.Use(pickup);
|
||||
|
|
|
|||
|
|
@ -68,7 +68,7 @@ extend Class Spreadgun
|
|||
}
|
||||
}
|
||||
|
||||
// Wallbuster (less of a fuck in the alt hud)
|
||||
// Wallbuster
|
||||
extend Class Wallbuster
|
||||
{
|
||||
ui TextureID WeaponBox, RoundTex, CursorTex;
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue