OrdinaryMagician/swwmgz_m
OrdinaryMagician/swwmgz_m
1
Fork 0
Code Activity

Combat Hammer alt/tertiary buff.

Browse source
This commit is contained in:
Mari the Deer 2022-09-09 11:40:50 +02:00
commit d760abd3d4
4 changed files with 7 additions and 7 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 r418 \cu(Fri 9 Sep 11:29:09 CEST 2022)\c-";
SWWM_SHORTVER="\cw1.3pre r418 \cu(2022-09-09 11:29:09)\c-";
SWWM_MODVER="\cyDEMOLITIONIST \cw1.3pre r419 \cu(Fri 9 Sep 11:40:50 CEST 2022)\c-";
SWWM_SHORTVER="\cw1.3pre r419 \cu(2022-09-09 11:40:50)\c-";

4
zscript/dlc1/swwm_hammertime.zsc
View file

@ -35,7 +35,7 @@ Class ItamexHammer : SWWMWeapon
Vector3 x, y, z;
[x, y, z] = swwm_CoordUtil.GetAxes(pitch,angle,roll);
SWWMUtility.DoKnockback(self,x,3000.*invoker.charge);
if ( A_Melee(int(100+invoker.charge*1.5),"itamex/hit",2.,1.1,1.2,MELEE_Rip|MELEE_FleshSound|MELEE_HammerHit|MELEE_Vertical|MELEE_ExtraWide|MELEE_ForceBust) )
if ( A_Melee(int(100+invoker.charge*2.),"itamex/hit",2.,1.1,1.2,MELEE_Rip|MELEE_FleshSound|MELEE_HammerHit|MELEE_Vertical|MELEE_ExtraWide|MELEE_ForceBust) )
{
A_BumpFOV(.9);
A_QuakeEx(5,5,5,20,0,1,"",QF_RELATIVE|QF_SCALEDOWN|QF_3D,rollIntensity:.35);
@ -97,7 +97,7 @@ Class ItamexHammer : SWWMWeapon
A_PlayerFire();
invoker.spintime++;
if ( invoker.hitcnt > 0 ) invoker.hitcnt--;
else if ( A_Melee(int(100+invoker.charge),"itamex/hit",2.4,2.,1.1,MELEE_Rip|MELEE_FleshSound|MELEE_ExtraWide|MELEE_HammerHit) )
else if ( A_Melee(int(100+invoker.charge*1.5),"itamex/hit",2.4,2.,1.1,MELEE_Rip|MELEE_FleshSound|MELEE_ExtraWide|MELEE_HammerHit) )
{
A_BumpFOV(.9);
A_QuakeEx(5,5,5,20,0,1,"",QF_RELATIVE|QF_SCALEDOWN|QF_3D,rollIntensity:.35);

4
zscript/dlc1/swwm_hammertime_fx.zsc
View file

@ -19,7 +19,7 @@ Class HammerShockwave : Actor
{
Super.PostBeginPlay();
A_QuakeEx(5,5,5,20,0,300+special1*4,"",QF_RELATIVE|QF_SCALEDOWN|QF_3D,falloff:200,rollIntensity:.8);
SWWMUtility.DoExplosion(self,60+special1,100000+special1*2000,80+special1,40,DE_BLAST|DE_EXTRAZTHRUST|DE_NONEXPLOSIVE,'HammerShockwave',target);
SWWMUtility.DoExplosion(self,80+special1,100000+special1*2000,80+special1,40,DE_BLAST|DE_EXTRAZTHRUST|DE_NONEXPLOSIVE,'HammerShockwave',target);
for ( int i=0; i<360; i+=5 )
{
Vector3 pvel = SWWMUtility.Vec3FromAngles(FRandom[ExploS](0,360),FRandom[ExploS](-90,90))*FRandom[ExploS](1,3);
@ -95,6 +95,6 @@ Class HammerRadiusShockwave : DemolitionistRadiusShockwave
{
Obituary "$O_HAMMER";
DamageType 'HammerShockwave';
DamageFunction int(200*alpha);
DamageFunction int(150*alpha);
}
}

2
zscript/swwm_player_fx.zsc
View file

@ -449,7 +449,7 @@ Class DemolitionistRadiusShockwave : Actor
{
target.vel.xy += vel.xy.unit()*(30000./max(50,target.mass))*alpha;
if ( (target.pos.z <= floorz) || !target.TestMobjZ() )
target.vel.z += (4000./max(50,target.mass))*alpha;
target.vel.z += (8000./max(50,target.mass))*alpha;
}
return damage;
}