OrdinaryMagician/stinger_m
OrdinaryMagician/stinger_m
1
Fork 0
Code Activity

1.1.1 update (same as flak_m):

Browse source 
- Sound overhaul.
 - Added extended '95 theme from Unreal mac port.
This commit is contained in:
Marisa the Magician 2020-01-04 22:33:10 +01:00
commit 6820c4deba
32 changed files with 297 additions and 282 deletions
Download patch file Download diff file Expand all files Collapse all files

26
zscript/betamag.zsc
View file

@ -171,7 +171,7 @@ Class Betamag : UnrealWeapon
player.setpsprite(2,ResolveState("LeftAltFire"));
}
}
private action bool TryWhip( double angle )
private action bool TryWhip( double angle, bool slave = false )
{
FTranslatedLineTarget t;
double slope = AimLineAttack(angle,DEFMELEERANGE,t,0.,ALF_CHECK3D);
@ -194,16 +194,16 @@ Class Betamag : UnrealWeapon
else if ( d.HitType == TRACE_HitWall )
d.HitLine.RemoteActivate(self,d.LineSide,SPAC_Impact,d.HitLocation-d.HitDir*4);
A_QuakeEx(1,1,1,3,0,1,"",QF_RELATIVE|QF_SCALEDOWN,rollIntensity:0.12);
A_PlaySound("betamag/hit",CHAN_WEAPON);
A_StartSound("betamag/hit",slave?CHAN_LEFTWEAPONMISC:CHAN_WEAPONMISC,CHANF_OVERLAP);
A_AlertMonsters();
return true;
}
return false;
}
action void A_BetamagWhip()
action void A_BetamagWhip( bool slave = false )
{
invoker.FireEffect();
for ( int i=0; i<16; i++ ) if ( TryWhip(angle+i*(45./16)) || TryWhip(angle-i*(45./16)) ) return;
for ( int i=0; i<16; i++ ) if ( TryWhip(angle+i*(45./16),slave) || TryWhip(angle-i*(45./16),slave) ) return;
}
action void A_BetamagFire( bool alt = false, bool slave = false )
{
@ -213,7 +213,7 @@ Class Betamag : UnrealWeapon
if ( !weap.DepleteAmmo(weap.bAltFire,true,1) ) return;
invoker.FireEffect();
UTMainHandler.DoFlash(self,Color(32,255,128,0),1);
A_PlaySound("betamag/fire",slave?CHAN_6:CHAN_WEAPON,!Dampener.Active(self)?1.:.2);
A_StartSound("betamag/fire",slave?CHAN_LEFTWEAPON:CHAN_WEAPON,CHANF_OVERLAP,!Dampener.Active(self)?1.:.2);
if ( !Dampener.Active(self) ) A_AlertMonsters();
A_QuakeEx(2,2,2,4,0,1,"",QF_RELATIVE|QF_SCALEDOWN,rollIntensity:0.08);
if ( slave )
@ -389,7 +389,7 @@ Class Betamag : UnrealWeapon
LeftReady:
2UTS A 0
{
A_PlaySound("betamag/select",CHAN_6,!Dampener.Active(self)?1.:.1);
A_StartSound("betamag/select",CHAN_LEFTWEAPON,CHANF_DEFAULT,!Dampener.Active(self)?1.:.1);
invoker.slaveactive = true;
}
2UTS ABCDEFGHIJK 2 A_JumpIf(invoker.slavedown,"LeftDeselect");
@ -437,7 +437,7 @@ Class Betamag : UnrealWeapon
}
AUTF BCD 1;
AUTF E 2;
AUTF F 0 A_PlaySound("betamag/slide",CHAN_ITEM,!Dampener.Active(self)?.3:.03);
AUTF F 0 A_StartSound("betamag/slide",CHAN_WEAPONMISC,CHANF_OVERLAP,!Dampener.Active(self)?.3:.03);
AUTF FGHI 2;
AUTF J 0 A_BetamagRefire("Hold");
AUTF J 2;
@ -454,7 +454,7 @@ Class Betamag : UnrealWeapon
2UTF A 1 A_BetamagFire(false,true);
2UTF BCD 1;
2UTF E 2;
2UTF F 0 A_PlaySound("betamag/slide",CHAN_7,!Dampener.Active(self)?.3:.03);
2UTF F 0 A_StartSound("betamag/slide",CHAN_LEFTWEAPONMISC,CHANF_OVERLAP,!Dampener.Active(self)?.3:.03);
2UTF FGHI 2;
2UTF J 0 A_BetamagRefire("LeftHold",true);
2UTF J 2;
@ -477,7 +477,7 @@ Class Betamag : UnrealWeapon
AltHold:
AUTA H 1 A_BetamagFire(true);
AUTA I 1;
AUTA J 0 A_PlaySound("betamag/slide",CHAN_ITEM,!Dampener.Active(self)?.3:.03);
AUTA J 0 A_StartSound("betamag/slide",CHAN_WEAPONMISC,CHANF_OVERLAP,!Dampener.Active(self)?.3:.03);
AUTA JKLM 1;
AUTA N 0 A_BetamagRefire("AltHold");
AUTA NOPQ 2;
@ -491,7 +491,7 @@ Class Betamag : UnrealWeapon
LeftAltHold:
2UTA H 1 A_BetamagFire(true,true);
2UTA I 1;
2UTA J 0 A_PlaySound("betamag/slide",CHAN_7,!Dampener.Active(self)?.3:.03);
2UTA J 0 A_StartSound("betamag/slide",CHAN_LEFTWEAPONMISC,CHANF_OVERLAP,!Dampener.Active(self)?.3:.03);
2UTA JKLM 1;
2UTA N 0 A_BetamagRefire("LeftAltHold",true);
2UTA NOPQ 2;
@ -508,7 +508,7 @@ Class Betamag : UnrealWeapon
AUTW F 0
{
if ( self is 'UTPlayer' ) UTPlayer(self).PlayAttacking3();
A_PlaySound("betamag/whip",CHAN_ITEM);
A_StartSound("betamag/whip",CHAN_WEAPON,CHANF_OVERLAP);
UTMainHandler.DoSwing(self,(FRandom[Betamag](-0.3,-0.2),FRandom[Betamag](-0.8,-0.5)),7,-1,8,SWING_Spring,2,0.5);
}
AUTW FGHIJ 2;
@ -540,7 +540,7 @@ Class Betamag : UnrealWeapon
2UTW F 0
{
if ( self is 'UTPlayer' ) UTPlayer(self).PlayAttacking3();
A_PlaySound("betamag/whip",CHAN_7);
A_StartSound("betamag/whip",CHAN_LEFTWEAPON,CHANF_OVERLAP);
UTMainHandler.DoSwing(self,(FRandom[Betamag](0.2,0.3),FRandom[Betamag](-0.8,-0.5)),7,-1,8,SWING_Spring,2,0.5);
}
2UTW FGHIJ 2;
@ -549,7 +549,7 @@ Class Betamag : UnrealWeapon
UTMainHandler.DoSwing(self,(FRandom[Betamag](-0.3,-0.2),FRandom[Betamag](0.8,0.5)),3,0.5,6,SWING_Spring,3,3);
}
2UTW KLM 1;
2UTW N 0 A_BetamagWhip();
2UTW N 0 A_BetamagWhip(true);
2UTW NOPQR 1;
2UTW STUVWXYZ[\ 2;
2UTI A 0 A_JumpIf((invoker.Ammo1.Amount<=0)&&(player.cmd.buttons&(BT_ATTACK|BT_ALTATTACK))||(player.cmd.buttons&BT_RELOAD),"LeftReloadHold");