OrdinaryMagician/flak_m
OrdinaryMagician/flak_m
1
Fork 0
Code Activity

Fix typo in biorifle blast momentum value.

Browse source 
Minor corrections.
This commit is contained in:
Marisa the Magician 2018-08-17 20:59:27 +02:00
commit 27017feed2
5 changed files with 2 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

3
zscript/biorifle.zsc
View file

@ -411,7 +411,7 @@ Class BioGel : Actor
s.args[3] = int(s.args[3]*Scale.x); s.args[3] = int(s.args[3]*Scale.x);
invoker.deadtimer = -2; invoker.deadtimer = -2;
if ( invoker.atline ) invoker.atline.RemoteActivate(target,invoker.atside,SPAC_Impact,pos); if ( invoker.atline ) invoker.atline.RemoteActivate(target,invoker.atside,SPAC_Impact,pos);
UTMainHandler.DoBlast(self,Min(150,int(Scale.x*25)),200000); UTMainHandler.DoBlast(self,Min(150,int(Scale.x*25)),20000*Scale.x);
A_Explode(int(Random[GES](18,22)*max(1,(Scale.x-1)**2)),Min(150,int(Scale.x*25))); A_Explode(int(Random[GES](18,22)*max(1,(Scale.x-1)**2)),Min(150,int(Scale.x*25)));
A_PlaySound("ges/explode",CHAN_VOICE); A_PlaySound("ges/explode",CHAN_VOICE);
int numpt = Min(300,int(Scale.x*30))+Random[GES](-10,10); int numpt = Min(300,int(Scale.x*30))+Random[GES](-10,10);
@ -438,7 +438,6 @@ Class BioGel : Actor
{ {
Obituary "%o drank a glass of %k's dripping green load."; Obituary "%o drank a glass of %k's dripping green load.";
DamageType 'Slime'; DamageType 'Slime';
Damage 0;
RenderStyle "Add"; RenderStyle "Add";
Radius 3; Radius 3;
Height 3; Height 3;

1
zscript/eightball.zsc
View file

@ -105,7 +105,6 @@ Class UTRocket : Actor
Default Default
{ {
Obituary "%o was smacked down by %k's Rocket Launcher."; Obituary "%o was smacked down by %k's Rocket Launcher.";
Damage 0;
DamageType 'RocketDeath'; DamageType 'RocketDeath';
Radius 2; Radius 2;
Height 2; Height 2;

3
zscript/flakcannon.zsc
View file

@ -133,7 +133,6 @@ Class FlakChunk : Actor
double rollvel, pitchvel, yawvel; double rollvel, pitchvel, yawvel;
double lifetime, lifespeed; double lifetime, lifespeed;
int lifetics; int lifetics;
bool hasbounced;
Default Default
{ {
Obituary "%o was ripped to shreds by %k's Flak Cannon."; Obituary "%o was ripped to shreds by %k's Flak Cannon.";
@ -210,7 +209,6 @@ Class FlakChunk : Actor
} }
action void A_HandleBounce() action void A_HandleBounce()
{ {
invoker.hasbounced = true;
A_SprayDecal("WallCrack",-8); A_SprayDecal("WallCrack",-8);
int numpt = Random[Flak](2,3); int numpt = Random[Flak](2,3);
if ( frame < 10 ) if ( frame < 10 )
@ -359,7 +357,6 @@ Class FlakSlug : Actor
{ {
Obituary "%o was ripped to shreds by %k's Flak Cannon."; Obituary "%o was ripped to shreds by %k's Flak Cannon.";
DamageType 'FlakDeath'; DamageType 'FlakDeath';
Damage 0;
Radius 2; Radius 2;
Height 2; Height 2;
Speed 40; Speed 40;

2
zscript/ripper.zsc
View file

@ -185,7 +185,7 @@ Class Razor2Alt : Razor2
{ {
Default Default
{ {
Damage 0; DamageFunction 0;
DamageType 'RipperAltDealth'; DamageType 'RipperAltDealth';
BounceType "None"; BounceType "None";
-CANBOUNCEWATER; -CANBOUNCEWATER;

2
zscript/shockrifle.zsc
View file

@ -854,7 +854,6 @@ Class ShockBall : Actor
Obituary "%k inflicted mortal damage upon %o with the Shock Rifle"; Obituary "%k inflicted mortal damage upon %o with the Shock Rifle";
RenderStyle "Add"; RenderStyle "Add";
DamageType 'jolted'; DamageType 'jolted';
Damage 0;
Radius 2; Radius 2;
Height 2; Height 2;
Scale 0.4; Scale 0.4;
@ -920,7 +919,6 @@ Class SuperShockBall : Actor
Obituary "%k electrified %o with the Enhanced Shock Rifle."; Obituary "%k electrified %o with the Enhanced Shock Rifle.";
RenderStyle "Add"; RenderStyle "Add";
DamageType 'joltedX'; DamageType 'joltedX';
Damage 0;
Radius 2; Radius 2;
Height 2; Height 2;
Scale 0.5; Scale 0.5;