OrdinaryMagician/swwmgz_m
OrdinaryMagician/swwmgz_m
1
Fork 0
Code Activity

Remove redundant "clearscope" from utility functions.

Browse source
This commit is contained in:
Mari the Deer 2022-12-18 20:12:17 +01:00
commit e5cb32bc02
8 changed files with 73 additions and 73 deletions
Download patch file Download diff file Expand all files Collapse all files

18
zscript/utility/swwm_utility_info.zsc
View file

@ -281,7 +281,7 @@ extend Class SWWMUtility
}
// gendered languages are a fuck
static clearscope bool SellFemaleItem( Inventory i, String loc = "SWWM_SELLEXTRA_FEM" )
static bool SellFemaleItem( Inventory i, String loc = "SWWM_SELLEXTRA_FEM" )
{
// no gendered string alt
if ( StringTable.Localize("$"..loc) == loc )
@ -305,14 +305,14 @@ extend Class SWWMUtility
}
// returns the plural tag (if available)
static clearscope string GetAmmoTag( Inventory i )
static string GetAmmoTag( Inventory i )
{
if ( i is 'MagAmmo' ) return StringTable.Localize("$T_"..MagAmmo(i).PickupTag.."S");
if ( i is 'SWWMAmmo' ) return StringTable.Localize("$T_"..SWWMAmmo(i).PickupTag.."S");
return i.GetTag();
}
// because of zscript fuckery with GetDefaultByType
static clearscope string GetAmmoTagClass( Class<Inventory> i )
static string GetAmmoTagClass( Class<Inventory> i )
{
if ( i is 'MagAmmo' ) return StringTable.Localize("$T_"..GetDefaultByType((Class<MagAmmo>)(i)).PickupTag.."S");
if ( i is 'SWWMAmmo' ) return StringTable.Localize("$T_"..GetDefaultByType((Class<SWWMAmmo>)(i)).PickupTag.."S");
@ -342,7 +342,7 @@ extend Class SWWMUtility
}
// Is this a beam projectile? (speed == length)
static play bool IsBeamProj( Actor a )
static bool IsBeamProj( Actor a )
{
if ( a is 'SaltBeam' ) return true;
if ( a is 'BiosparkBeam' ) return true;
@ -356,13 +356,13 @@ extend Class SWWMUtility
return false;
}
// is this a YBeam type? (real pitch is pitch-90)
static play bool IsYBeam( Actor a )
static bool IsYBeam( Actor a )
{
if ( a is 'MisterRailBeam' ) return true;
return false;
}
static clearscope bool IdentifyingDog( Actor a )
static bool IdentifyingDog( Actor a )
{
if ( a is 'MBFHelperDog' ) return true;
if ( a is 'SWWMDog' ) return true;
@ -375,7 +375,7 @@ extend Class SWWMUtility
return false;
}
static clearscope bool IdentifyingCaco( Actor a )
static bool IdentifyingCaco( Actor a )
{
if ( a is 'DeadCacodemon' ) return false;
if ( a is 'Cacodemon' ) return true;
@ -388,13 +388,13 @@ extend Class SWWMUtility
}
// Друг
static clearscope bool IdentifyingDrug( Actor a )
static bool IdentifyingDrug( Actor a )
{
if ( a is 'Beast' ) return true;
return false;
}
static clearscope bool IdentifyingDoubleBoi( Actor a )
static bool IdentifyingDoubleBoi( Actor a )
{
if ( a is 'Ettin' ) return true;
return false;