OrdinaryMagician/swwmgz_m
OrdinaryMagician/swwmgz_m
1
Fork 0
Code Activity

ass piss poo fart butt

Browse source
This commit is contained in:
Mari the Deer 2021-10-23 21:39:35 +02:00
commit f5b52dd9b0
8 changed files with 19 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

4
zscript/items/swwm_ammospawn.zsc
View file

@ -83,12 +83,12 @@ Class SWWMShellAmmoBig : SWWMAmmoSpawner
case 1:
case 2:
case 3:
return 'RedShell';
return 'RedShell2';
case 4:
case 5:
case 6:
case 7:
return 'GreenShell';
return 'GreenShell2';
case 8:
case 9:
case 10:

8
zscript/weapons/swwm_blazeit_fx.zsc
View file

@ -334,7 +334,7 @@ Class HellblazerMissile : Actor
A_SetRenderStyle(1.0,STYLE_Add);
A_SprayDecal("BigRocketBlast",50);
A_SetScale(4.5);
SWWMUtility.DoExplosion(self,150,320000,200,90);
SWWMUtility.DoExplosion(self,200,320000,200,90);
A_NoGravity();
A_QuakeEx(5,5,5,15,0,1500,"",QF_RELATIVE|QF_SCALEDOWN,falloff:500,rollIntensity:.8);
A_StopSound(CHAN_BODY);
@ -431,7 +431,7 @@ Class HellblazerCrackshot : HellblazerMissile
A_SetRenderStyle(1.0,STYLE_Add);
A_SprayDecal("BigRocketBlast",50);
A_SetScale(3.);
SWWMUtility.DoExplosion(self,120,320000,160,60);
SWWMUtility.DoExplosion(self,160,320000,160,60);
A_NoGravity();
A_QuakeEx(4,4,4,12,0,1200,"",QF_RELATIVE|QF_SCALEDOWN,falloff:400,rollIntensity:.6);
A_StopSound(CHAN_BODY);
@ -502,7 +502,7 @@ Class HellblazerRavager : HellblazerMissile
A_SetRenderStyle(1.0,STYLE_Add);
A_SprayDecal("HugeRocketBlast",50);
A_SetScale(8.);
SWWMUtility.DoExplosion(self,250,320000,300,120);
SWWMUtility.DoExplosion(self,300,320000,300,120);
A_NoGravity();
A_QuakeEx(6,6,6,30,0,2000,"",QF_RELATIVE|QF_SCALEDOWN,falloff:800,rollIntensity:1.);
A_StopSound(CHAN_BODY);
@ -895,7 +895,7 @@ Class HellblazerClusterMini : HellblazerMissile2
A_SetRenderStyle(1.0,STYLE_Add);
A_SprayDecal("BigRocketBlast",50);
A_SetScale(2.5);
SWWMUtility.DoExplosion(self,30,200000,150,60);
SWWMUtility.DoExplosion(self,50,200000,150,60);
A_NoGravity();
A_QuakeEx(4,4,4,12,0,1000,"",QF_RELATIVE|QF_SCALEDOWN,falloff:400,rollIntensity:.6);
A_StopSound(CHAN_BODY);

5
zscript/weapons/swwm_danmaku.zsc
View file

@ -119,6 +119,7 @@ Class Eviscerator : SWWMWeapon
[x2, y2, z2] = swwm_CoordUtil.GetAxes(BulletSlope(),angle,roll);
origin = level.Vec3Offset(Vec2OffsetZ(0,0,player.viewz),10*x+4*y-5*z);
int trail = CVar.GetCVar('swwm_funtrails',player).GetInt();
if ( trail == 8 ) trail = Random[Eviscerator](1,7);
for ( int i=0; i<25; i++ )
{
a = FRandom[Eviscerator](0,360);
@ -131,8 +132,8 @@ Class Eviscerator : SWWMWeapon
p.vel = dir*p.speed*FRandom[Eviscerator](.9,1.1);
if ( invoker.extended ) p.vel *= 1.5;
if ( trail < 8 ) p.trailcolor = max(0,trail);
else if ( trail == 8 ) p.trailcolor = (i%6)+2;
else if ( trail == 9 )
else if ( trail == 9 ) p.trailcolor = (i%6)+2;
else if ( trail == 10 )
{
switch ( i%5 )
{

5
zscript/weapons/swwm_danmaku_fx.zsc
View file

@ -505,6 +505,7 @@ Class EvisceratorProj : Actor
}
int trail = 0;
if ( target && target.player ) trail = CVar.GetCVar('swwm_funtrails',target.player).GetInt();
if ( trail == 8 ) trail = Random[Eviscerator](0,7);
for ( int i=0; i<25; i++ )
{
p = EvisceratorChunk(Spawn("EvisceratorChunk",level.Vec3Offset(pos,spawnofs)));
@ -517,8 +518,8 @@ Class EvisceratorProj : Actor
p.vel = (cos(p.angle)*cos(p.pitch),sin(p.angle)*cos(p.pitch),-sin(p.pitch))*(p.speed+FRandom[Eviscerator](-5,20));
p.target = target;
if ( trail < 8 ) p.trailcolor = max(0,trail);
else if ( trail == 8 ) p.trailcolor = (i%6)+2;
else if ( trail == 9 )
else if ( trail == 9 ) p.trailcolor = (i%6)+2;
else if ( trail == 10 )
{
switch ( i%5 )
{