OrdinaryMagician/swwmgz_m
OrdinaryMagician/swwmgz_m
1
Fork 0
Code Activity

Deep Impact alt bullet no longer has lethal splash damage.

Browse source
This commit is contained in:
Mari the Deer 2022-04-19 00:59:41 +02:00
commit e12bf46f5e
2 changed files with 8 additions and 6 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 r37 \cu(Mon 18 Apr 23:03:57 CEST 2022)\c-";
SWWM_SHORTVER="\cw1.3pre r37 \cu(2022-04-18 23:03:57)\c-";
SWWM_MODVER="\cyDEMOLITIONIST \cw1.3pre r39 \cu(Tue 19 Apr 01:00:27 CEST 2022)\c-";
SWWM_SHORTVER="\cw1.3pre r39 \cu(2022-04-19 01:00:27)\c-";

10
zscript/weapons/swwm_deepdarkimpact_fx.zsc
View file

@ -10,7 +10,7 @@ Class AirBullet : FastProjectile
Obituary "$O_DEEPIMPACT";
Radius 2;
Height 4;
DamageFunction 100;
DamageFunction 50;
DamageType 'AirRip';
Speed 400;
PROJECTILE;
@ -31,8 +31,10 @@ Class AirBullet : FastProjectile
lasthit = target;
}
Vector3 dirto = level.Vec3Offset(pos,target.Vec3Offset(0,0,target.Height/2.));
if ( vel.length() <= double.epsilon ) return damage;
if ( dirto.length() <= double.epsilon ) dirto = vel;
dirto /= dirto.length();
SWWMUtility.DoKnockback(target,vel.unit()*.6+dirto*.4,200000);
SWWMUtility.DoKnockback(target,vel.unit()*.6+dirto*.4,80000);
if ( !target.player ) target.bBLASTED = true;
return damage;
}
@ -56,7 +58,7 @@ Class AirBullet : FastProjectile
s.alpha *= .2;
}
bAMBUSH = true;
SWWMUtility.DoExplosion(self,GetMissileDamage(0,0),0,100,25,ignoreme:target);
SWWMUtility.DoExplosion(self,10,0,100,25,ignoreme:target);
bAMBUSH = false;
tcnt++;
if ( tcnt < 2 ) return;
@ -76,7 +78,7 @@ Class AirBullet : FastProjectile
if ( (target.pos.z > target.floorz) && target.TestMobjZ() ) mm *= 1.6;
SWWMUtility.DoKnockback(target,dir,mm);
}
SWWMUtility.DoExplosion(self,0,200000,200,80,ignoreme:target);
SWWMUtility.DoExplosion(self,20,80000,200,80,ignoreme:target);
A_QuakeEx(6,6,6,20,0,250,"",QF_RELATIVE|QF_SCALEDOWN,rollIntensity:1.);
A_StartSound("deepimpact/bullethit",CHAN_VOICE,CHANF_DEFAULT,1.,.3);
A_SprayDecal("ImpactMark");