OrdinaryMagician/flak_m
OrdinaryMagician/flak_m
1
Fork 0
Code Activity

Make biorifle damage proportional to square of sludge scale.

Browse source 
Tweaked the timing of the Enforcer and Dual Enforcers.
This commit is contained in:
Marisa the Magician 2018-06-13 13:38:23 +02:00
commit 046833ccc1
2 changed files with 16 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

4
zscript/biorifle.zsc
View file

@ -402,7 +402,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);
A_Explode(int(Random[GES](20,40)*Scale.x),Min(150,int(Scale.x*25))); A_Explode(int(Random[GES](10,20)*Scale.x*Scale.x),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);
for ( int i=0; i<numpt; i++ ) for ( int i=0; i<numpt; i++ )
@ -428,7 +428,7 @@ 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';
DamageFunction Random[GES](20,40)*Scale.x; DamageFunction int(Random[GES](10,20)*Scale.x*Scale.x);
RenderStyle "Add"; RenderStyle "Add";
Radius 3; Radius 3;
Height 3; Height 3;

21
zscript/enforcer.zsc
View file

@ -456,16 +456,22 @@ Class Enforcer : UTWeapon replaces Pistol
ENFF A 0 A_Overlay(-9999,"Null"); ENFF A 0 A_Overlay(-9999,"Null");
Hold: Hold:
ENFF A 0 A_EnforcerFire(); ENFF A 0 A_EnforcerFire();
ENFF ABCDEFGHI 1; ENFF ABCDEFGHIJ 1;
ENFF J 3 A_EnforcerRefire(); ENFF J 0 A_EnforcerRefire();
ENFF J 2;
ENFI A 0;
Goto Idle; Goto Idle;
LeftFire: LeftFire:
2NFI A 0 A_Overlay(-9998,"Null"); 2NFI A 0 A_Overlay(-9998,"Null");
2NFI A 1 A_SetTics(Random[Enforcer](0,5)); 2NFI A 1 A_SetTics(Random[Enforcer](5,6));
2NFI A 0 A_EnforcerRefire(1,true);
Goto LeftIdle;
LeftHold: LeftHold:
2NFF A 0 A_EnforcerFire(false,true); 2NFF A 0 A_EnforcerFire(false,true);
2NFF ABCDEFGHI 1; 2NFF ABCDEFGHIJ 1;
2NFF J 3 A_EnforcerRefire("LeftHold",true); 2NFF J 0 A_EnforcerRefire("LeftHold",true);
2NFF J 2;
2NFI A 0;
Goto LeftIdle; Goto LeftIdle;
AltFire: AltFire:
ENFA A 0 A_Overlay(-9999,"Null"); ENFA A 0 A_Overlay(-9999,"Null");
@ -478,8 +484,9 @@ Class Enforcer : UTWeapon replaces Pistol
Goto Idle; Goto Idle;
LeftAltFire: LeftAltFire:
2NFI A 0 A_Overlay(-9998,"Null"); 2NFI A 0 A_Overlay(-9998,"Null");
2NFI A 1 A_SetTics(Random[Enforcer](0,5)); 2NFI A 1 A_SetTics(Random[Enforcer](5,6));
2NFI A 0; 2NFI A 0 A_EnforcerRefire(1,true);
Goto LeftIdle;
2NFA ABCDEF 1; 2NFA ABCDEF 1;
LeftAltHold: LeftAltHold:
2NFA G 0 A_EnforcerFire(true,true); 2NFA G 0 A_EnforcerFire(true,true);