OrdinaryMagician/flak_m
OrdinaryMagician/flak_m
1
Fork 0
Code Activity

Added Jump Boots and removed Shielding Suit.

Browse source 
Recalculated all the model transforms in preparation for coelckers/gzdoom#495.
Corrected some small mistakes in Dual Enforcers code.
This commit is contained in:
Marisa the Magician 2018-05-28 13:55:05 +02:00
commit def0e317f3
26 changed files with 312 additions and 318 deletions
Download patch file Download diff file Expand all files Collapse all files

12
zscript/enforcer.zsc
View file

@ -157,15 +157,11 @@ Class Enforcer : UTWeapon replaces Pistol
else Screen.DrawText(confont,Font.CR_GREEN,Screen.GetWidth()*0.01,Screen.GetHeight()*0.88,String.Format("Clip: % 2d / 20",clipcount));
}
override bool HandlePickup (Inventory item)
override bool HandlePickup( Inventory item )
{
if ( item.GetClass() == GetClass() )
{
if ( item.Amount == 1 )
{
item.bPickupGood = true;
item.SetTag("Dual Enforcers");
}
SetTag("Dual Enforcers");
return Super.HandlePickup(item);
}
return false;
@ -199,7 +195,7 @@ Class Enforcer : UTWeapon replaces Pistol
if ( !weap || !player ) return;
if ( slave )
{
if ( invoker.slaveclipcount < 5 ) A_PlaySound("enforcer/click",CHAN_7);
if ( CVar.GetCVar('flak_enforcerreload').GetBool() && (invoker.slaveclipcount < 5) ) A_PlaySound("enforcer/click",CHAN_7);
if ( (invoker.slaveclipcount <= 0) || (weap.Ammo1.Amount <= 0) )
{
invoker.slaverefire = 0;
@ -226,7 +222,7 @@ Class Enforcer : UTWeapon replaces Pistol
}
else
{
if ( invoker.clipcount < 5 ) A_PlaySound("enforcer/click",CHAN_WEAPON);
if ( CVar.GetCVar('flak_enforcerreload').GetBool() && (invoker.clipcount < 5) ) A_PlaySound("enforcer/click",CHAN_WEAPON);
if ( (invoker.clipcount <= 0) || (weap.Ammo1.Amount <= 0) )
{
A_ClearRefire();