OrdinaryMagician/swwmgz_m
OrdinaryMagician/swwmgz_m
1
Fork 0
Code Activity

Slightly nerf Slot 5 (Eviscerator, Sheen HMG).

Browse source
This commit is contained in:
Mari the Deer 2023-09-05 23:33:46 +02:00
commit 1d13d74f19
4 changed files with 15 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

4
language.version
View file

@ -1,3 +1,3 @@
[default]
SWWM_MODVER="\cyDEMOLITIONIST \cw1.3pre r950 \cu(Mon 4 Sep 14:21:31 CEST 2023)\c-";
SWWM_SHORTVER="\cw1.3pre r950 \cu(2023-09-04 14:21:31)\c-";
SWWM_MODVER="\cyDEMOLITIONIST \cw1.3pre r951 \cu(Tue 5 Sep 23:33:46 CEST 2023)\c-";
SWWM_SHORTVER="\cw1.3pre r951 \cu(2023-09-05 23:33:46)\c-";

4
zscript/dlc1/swwm_heavymahsheengun.zsc
View file

@ -154,8 +154,8 @@ Class HeavyMahSheenGun : SWWMWeapon
Vector3 dir = SWWMUtility.ConeSpread(x2,y2,z2,a,s);
if ( !invoker.st ) invoker.st = new("PiercingTracer");
let st = invoker.st; // thanks zscript
st.penetration = 60.+invoker.barrelheat/5.;
st.resist = .6+invoker.barrelheat/500.;
st.penetration = 25.+invoker.barrelheat/6.;
st.resist = .6+invoker.barrelheat/600.;
st.hitlist.Clear();
st.shootthroughlist.Clear();
st.waterhitlist.Clear();

2
zscript/dlc1/swwm_heavymahsheengun_fx.zsc
View file

@ -76,7 +76,7 @@ Class SheenTrail : SWWMNonInteractiveActor
for ( int i=0; i<dist; i+=50 )
{
SetOrigin(level.Vec3Offset(oldpos,tdir*i),true);
SWWMUtility.DoExplosion(self,min(4*special1+i/50,10)+int(specialf2/10),2000,50,0,DE_NONEXPLOSIVE,ignoreme:target);
SWWMUtility.DoExplosion(self,min(3*special1,10)+int(specialf2/10),2000,50,0,DE_NONEXPLOSIVE,ignoreme:target);
}
prev = oldpos; // interpolation
SetOrigin(newpos,true);

20
zscript/weapons/swwm_danmaku_fx.zsc
View file

@ -136,7 +136,7 @@ Class EvisceratorChunk : Actor
Radius 2;
Height 4;
Speed 50;
DamageFunction int(clamp((vel.length()-5)*.2,0,15)+(max(0,1-lifetime)**5)*10);
DamageFunction int(clamp((vel.length()-5)*.15,0,10)+(max(0,1-lifetime)**5)*5);
DamageType 'Shrapnel';
BounceFactor 1.0;
WallBounceFactor 1.0;
@ -421,11 +421,11 @@ Class EvisceratorProj : Actor
A_SetRenderStyle(1.0,STYLE_Add);
A_SprayDecal("BigRocketBlast",50);
A_NoGravity();
A_SetScale(3.);
SWWMUtility.DoExplosion(self,120,120000,150,80);
A_QuakeEx(6.,6.,6.,20,0,1200,"",QF_RELATIVE|QF_SCALEDOWN|QF_3D,falloff:300,rollIntensity:.7);
A_StartSound("eviscerator/shell",CHAN_WEAPON,attenuation:.5);
A_StartSound("eviscerator/shell",CHAN_VOICE,attenuation:.3);
A_SetScale(2.5);
SWWMUtility.DoExplosion(self,80,120000,100,50);
A_QuakeEx(6.,6.,6.,20,0,900,"",QF_RELATIVE|QF_SCALEDOWN|QF_3D,falloff:300,rollIntensity:.7);
A_StartSound("eviscerator/shell",CHAN_WEAPON,attenuation:.8);
A_StartSound("eviscerator/shell",CHAN_VOICE,attenuation:.5);
A_AlertMonsters(swwm_uncapalert?0:3000,AMF_EMITFROMTARGET);
if ( !Tracer ) Spawn("EvisceratorProjSmoke",pos);
Spawn("EvisceratorProjLight",pos);
@ -517,7 +517,7 @@ Class EvisceratorProj : Actor
pt = FRandom[Eviscerator](-90,90);
FLineTraceData d;
Vector3 HitNormal;
LineTrace(ang,FRandom[Eviscerator](10,30)+10*special1,pt,TRF_THRUACTORS,data:d);
LineTrace(ang,FRandom[Eviscerator](6,20)+8*special1,pt,TRF_THRUACTORS,data:d);
hitnormal = SWWMUtility.GetLineTraceHitNormal(d);
let p = Spawn("EvisceratorSubExpl",d.HitLocation+hitnormal*4);
p.angle = atan2(hitnormal.y,hitnormal.x);
@ -552,7 +552,7 @@ Class EvisceratorSubExpl : SWWMNonInteractiveActor
Default
{
RenderStyle "Add";
Scale 2.;
Scale 1.8;
Alpha .6;
+FORCEXYBILLBOARD;
}
@ -569,13 +569,13 @@ Class EvisceratorRing : SWWMNonInteractiveActor
Default
{
RenderStyle "Add";
Scale 4.;
Scale 2.;
+FORCEXYBILLBOARD;
}
States
{
Spawn:
XRG0 ABCDEFGHIJKLMNOPQRSTUVWX 1 Bright A_SetScale(scale.x*1.01);
XRG0 ABCDEFGHIJKLMNOPQRSTUVWX 1 Bright A_SetScale(scale.x*1.04);
Stop;
}
}