OrdinaryMagician/flak_m
OrdinaryMagician/flak_m
1
Fork 0
Code Activity

1.1.1 update (to be made stable after GZDoom updates):

Browse source 
- Sound overhaul, migrated everything to A_StartSound, new sound channels, CHANF_OVERLAP where needed.
 - Fancy titlemap (two variants, one based on the ps2 menu, one based on the v222 menu).
This commit is contained in:
Marisa the Magician 2020-01-04 22:30:14 +01:00
commit 94cba843e4
42 changed files with 272 additions and 179 deletions
Download patch file Download diff file Expand all files Collapse all files

23
zscript/enforcer.zsc
View file

@ -83,7 +83,8 @@ Class BulletImpact : Actor
let s = Spawn("UTChip",pos+x*2);
s.vel = pvel;
}
A_PlaySound("bullet/hit",CHAN_VOICE,attenuation:3.0);
if ( !Random[Enforcer](0,3) ) A_StartSound("flak/hit",CHAN_VOICE,attenuation:2.5);
else A_StartSound("bullet/hit",CHAN_VOICE,attenuation:3.0);
let s = Spawn("Splasher",Vec3Offset(0,0,2));
s.vel = (0,0,-4);
}
@ -274,7 +275,7 @@ Class Enforcer : UTWeapon
if ( invoker.altaccuracy < 0.2 ) invoker.altaccuracy += 0.05;
if ( slave )
{
if ( flak_enforcerreload && (invoker.slaveclipcount < 5) ) A_PlaySound("enforcer/click",CHAN_6);
if ( flak_enforcerreload && (invoker.slaveclipcount < 5) ) A_StartSound("enforcer/click",CHAN_LEFTWEAPONMISC);
if ( (invoker.slaveclipcount <= 0) || (weap.Ammo1.Amount <= 0) )
{
invoker.slaverefire = 0;
@ -301,7 +302,7 @@ Class Enforcer : UTWeapon
}
else
{
if ( flak_enforcerreload && (invoker.clipcount < 5) ) A_PlaySound("enforcer/click",CHAN_WEAPON);
if ( flak_enforcerreload && (invoker.clipcount < 5) ) A_StartSound("enforcer/click",CHAN_WEAPONMISC);
if ( (invoker.clipcount <= 0) || (weap.Ammo1.Amount <= 0) )
{
A_ClearRefire();
@ -357,7 +358,7 @@ Class Enforcer : UTWeapon
}
invoker.FireEffect();
UTMainHandler.DoFlash(self,Color(32,255,128,0),1);
A_PlaySound("enforcer/shoot",slave?CHAN_6:CHAN_WEAPON);
A_StartSound("enforcer/shoot",slave?CHAN_LEFTWEAPON:CHAN_WEAPON,CHANF_OVERLAP);
A_AlertMonsters();
A_QuakeEx(2,2,2,4,0,1,"",QF_RELATIVE|QF_SCALEDOWN,rollIntensity:0.08);
if ( slave )
@ -518,7 +519,7 @@ Class Enforcer : UTWeapon
LeftReady:
2NFS A 0
{
A_PlaySound("enforcer/select",CHAN_6);
A_StartSound("enforcer/select",CHAN_LEFTWEAPON);
invoker.slaveactive = true;
}
2NFS ABCDEFGHIJKLMNOPQRSTUVWXYZ 1 A_JumpIf(invoker.slavedown,"LeftDeselect");
@ -619,7 +620,7 @@ Class Enforcer : UTWeapon
invoker.clipout = true;
invoker.clipcount = 0;
A_Overlay(-9999,null);
A_PlaySound("enforcer/click",CHAN_WEAPON);
A_StartSound("enforcer/click",CHAN_WEAPONMISC);
}
ENFR ABCDEFGHIJKLMNOPQRSTUVWXYZ 1;
ENR2 AB 1;
@ -627,7 +628,7 @@ Class Enforcer : UTWeapon
{
invoker.clipout = false;
invoker.clipcount = min(invoker.default.clipcount,invoker.Ammo1.Amount);
A_PlaySound("enforcer/reload",CHAN_WEAPON);
A_StartSound("enforcer/reload",CHAN_WEAPON);
if ( self is 'UTPlayer' )
UTPlayer(self).PlayReloading();
invoker.slavereload = (flak_enforcerreload&&invoker.slaveactive&&(invoker.slaveclipcount<min(invoker.default.slaveclipcount,invoker.Ammo1.Amount)));
@ -639,7 +640,7 @@ Class Enforcer : UTWeapon
c.pitch = pitch;
c.vel = vel*.5+x*FRandom[Junk](-.5,.5)+y*FRandom[Junk](-.5,.5)-z*FRandom[Junk](1,2);
}
ENFS A 0 A_PlaySound("enforcer/select",CHAN_WEAPON);
ENFS A 0 A_StartSound("enforcer/select",CHAN_WEAPON);
Goto Ready;
LeftReload:
2NFR A 0
@ -652,7 +653,7 @@ Class Enforcer : UTWeapon
invoker.slaveclipout = true;
invoker.slaveclipcount = 0;
A_Overlay(-9998,null);
A_PlaySound("enforcer/click",CHAN_6);
A_StartSound("enforcer/click",CHAN_LEFTWEAPONMISC);
return ResolveState(null);
}
2NFR ABCDEFGHIJKLMNOPQRSTUVWXYZ 1;
@ -661,7 +662,7 @@ Class Enforcer : UTWeapon
{
invoker.slaveclipout = false;
invoker.slaveclipcount = min(invoker.default.slaveclipcount,invoker.Ammo1.Amount);
A_PlaySound("enforcer/reload",CHAN_6);
A_StartSound("enforcer/reload",CHAN_LEFTWEAPON);
if ( self is 'UTPlayer' )
UTPlayer(self).PlayReloading();
invoker.slavereload = false;
@ -673,7 +674,7 @@ Class Enforcer : UTWeapon
c.pitch = pitch;
c.vel = vel*.5+x*FRandom[Junk](-.5,.5)+y*FRandom[Junk](-.5,.5)-z*FRandom[Junk](1,2);
}
2NFS A 0 A_PlaySound("enforcer/select",CHAN_6);
2NFS A 0 A_StartSound("enforcer/select",CHAN_LEFTWEAPON);
Goto LeftReady;
Deselect:
ENFD A 0