Primary fire now functional in Combat Hammer.

This commit is contained in:
Mari the Deer 2022-08-11 01:54:40 +02:00
commit 0193ad5874
20 changed files with 280 additions and 2 deletions

View file

@ -3,6 +3,25 @@
Class ItamexHammer : SWWMWeapon
{
double charge;
action State A_HammerHit()
{
Vector3 x, y, z;
[x, y, z] = swwm_CoordUtil.GetAxes(pitch,angle,roll);
SWWMUtility.DoKnockback(self,x,120000.);
if ( A_Melee(100,"itamex/hit",1.5,1.1,2.,MELEE_Rip|MELEE_FleshSound) )
{
A_BumpFOV(.9);
A_QuakeEx(5,5,5,20,0,1,"",QF_RELATIVE|QF_SCALEDOWN|QF_3D,rollIntensity:.35);
A_AlertMonsters(swwm_uncapalert?0:800);
return ResolveState("FireHit");
}
A_BumpFOV(.95);
A_QuakeEx(1,1,1,15,0,1,"",QF_RELATIVE|QF_SCALEDOWN|QF_3D,rollIntensity:.1);
return ResolveState(null);
}
Default
{
Tag "$T_HAMMER";
@ -13,6 +32,7 @@ Class ItamexHammer : SWWMWeapon
Weapon.SlotNumber 1;
Weapon.SlotPriority 2.;
Weapon.SelectionOrder 1200;
Weapon.UpSound "itamex/select";
Stamina 9000;
+WEAPON.MELEEWEAPON;
Radius 8;
@ -23,5 +43,42 @@ Class ItamexHammer : SWWMWeapon
Spawn:
XZW1 A -1;
Stop;
Select:
XZW2 I 3 A_FullRaise();
XZW2 JK 3;
XZW2 LMNO 2;
XZW2 PQRST 3;
Goto Ready;
Ready:
XZW2 A 1 A_WeaponReady();
Wait;
Fire:
XZW2 A 2 A_StartSound("itamex/meleestart",CHAN_WEAPON,CHANF_OVERLAP);
XZW2 UVWXYZ 1;
XZW3 A 1
{
A_StartSound("itamex/swing",CHAN_WEAPON,CHANF_OVERLAP);
A_PlayerMelee();
}
XZW3 BCDE 1;
XZW3 F 1 A_HammerHit();
XZW3 GHIJK 2;
XZW3 L 2 A_StartSound("itamex/meleeend",CHAN_WEAPON,CHANF_OVERLAP);
XZW3 MNOPQR 2;
Goto Ready;
FireHit:
XZW3 FF 2;
XZW3 STU 2;
XZW3 VWXYZ 1;
XZW4 A 2;
XZW4 B 2 A_StartSound("itamex/meleeend",CHAN_WEAPON,CHANF_OVERLAP,starttime:.42);
XZW4 C 2;
Goto Ready;
Deselect:
XZW2 A 3 A_StartSound("itamex/deselect",CHAN_WEAPON,CHANF_OVERLAP);
XZW2 BCD 3;
XZW2 EFGHI 2;
XZW2 J -1 A_FullLower();
Stop;
}
}