Merge branch 'master' into hitowner

This commit is contained in:
Marisa the Magician 2018-08-18 00:04:30 +02:00
commit 82a6ae08ce
7 changed files with 36 additions and 22 deletions

View file

@ -186,8 +186,6 @@ Class Razor2Alt : Razor2
{
Default
{
DamageFunction 0;
DamageType 'RipperAltDealth';
BounceType "None";
-CANBOUNCEWATER;
+EXPLODEONWATER;
@ -205,7 +203,7 @@ Class Razor2Alt : Razor2
A_AlertMonsters();
A_SprayDecal("RazorBlast",20);
UTMainHandler.DoBlast(self,120,87000);
A_Explode(Random[Ripper](30,50),120);
A_Explode(Random[Ripper](30,50),180,damagetype:'RipperAltDeath');
A_QuakeEx(3,3,3,10,0,180,"",QF_RELATIVE|QF_SCALEDOWN,falloff:120,rollIntensity:0.1);
int numpt = Random[Ripper](10,20);
Vector3 x = (cos(angle)*cos(pitch),sin(angle)*cos(pitch),-sin(pitch));