OrdinaryMagician/swwmgz_m
OrdinaryMagician/swwmgz_m
1
Fork 0
Code Activity

Unimplemented weapon messages.

Browse source
This commit is contained in:
Mari the Deer 2022-07-06 13:31:23 +02:00
commit 3f20acc56e
5 changed files with 15 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

4
zscript/utility/swwm_utility.zsc
View file

@ -1773,10 +1773,10 @@ Class SWWMUtility
}
// gendered languages are a fuck
static clearscope bool SellFemaleItem( Inventory i )
static clearscope bool SellFemaleItem( Inventory i, String loc = "SWWM_SELLEXTRA_FEM" )
{
// no gendered string alt
if ( StringTable.Localize("$SWWM_SELLEXTRA_FEM") == "SWWM_SELLEXTRA_FEM" )
if ( StringTable.Localize("$"..loc) == loc )
return false;
if ( i is 'DeepImpact' ) return true;
if ( i is 'ExplodiumGun' ) return true;

8
zscript/weapons/swwm_baseweapon.zsc
View file

@ -57,6 +57,14 @@ Class SWWMWeapon : Weapon abstract
override void Touch( Actor toucher )
{
// show message about unimplemented weapons
State ReadyState = FindState('Ready');
if ( !ReadyState || !ReadyState.ValidateSpriteFrame() )
{
if ( toucher.CheckLocalView() )
Console.MidPrint(SmallFont,String.Format(StringTable.Localize(SWWMUtility.SellFemaleItem(self,"SWWM_TODOWEAPON_FEM")?"$SWWM_TODOWEAPON_FEM":"$SWWM_TODOWEAPON"),GetTag()));
return;
}
// show prompt to swap weapon, and prevent normal pickup
SWWMWeapon sw;
if ( bSPECIAL && swwm_swapweapons && (sw = HasSwapWeapon(toucher)) )